Last two files with fixes to the virtual inheritance warnings...

I have also attached the fix to the type shadowing problem in ConvexPolyhedron.cpp
This commit is contained in:
Björn Blissing
2016-06-03 17:33:45 +01:00
committed by Robert Osfield
parent abf34d2838
commit 6c842a534e
3 changed files with 6 additions and 8 deletions

View File

@@ -62,7 +62,7 @@ void AnimationManagerBase::operator()(osg::Node* node, osg::NodeVisitor* nv)
}
AnimationManagerBase::AnimationManagerBase(const AnimationManagerBase& b, const osg::CopyOp& copyop) : osg::Callback(b, copyop), osg::NodeCallback(b,copyop) // TODO check this
AnimationManagerBase::AnimationManagerBase(const AnimationManagerBase& b, const osg::CopyOp& copyop) : osg::NodeCallback(b,copyop) // TODO check this
{
const AnimationList& animationList = b.getAnimationList();
for (AnimationList::const_iterator it = animationList.begin();