Merge pull request #2222 from akortunov/warnfix

Attempt to fix Clang warnings about hidden virtual methods
pull/541/head
Bret Curtis 6 years ago committed by GitHub
commit a381a1aff4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -40,7 +40,7 @@ namespace Terrain
inline unsigned int getNumChildren() const { return _children.size(); } inline unsigned int getNumChildren() const { return _children.size(); }
// osg::Group::addChild() does a lot of unrelated stuff, but we just really want to add a child node. // osg::Group::addChild() does a lot of unrelated stuff, but we just really want to add a child node.
void addChild(QuadTreeNode* child) void addChildNode(QuadTreeNode* child)
{ {
// QuadTree node should not contain more than 4 child nodes. // QuadTree node should not contain more than 4 child nodes.
// Reserve enough space if this node is supposed to have child nodes. // Reserve enough space if this node is supposed to have child nodes.

@ -165,7 +165,7 @@ public:
if (child) if (child)
{ {
boundingBox.expandBy(child->getBoundingBox()); boundingBox.expandBy(child->getBoundingBox());
parent->addChild(child); parent->addChildNode(child);
} }
} }

Loading…
Cancel
Save