FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Submissions2e' of https://github.com/LaurensVoerman/OpenSceneGraph into LaurensVoerman-Submissions2e

Browse Source
This commit is contained in:
Robert Osfield
2016-09-02 18:26:11 +01:00
parent c19b271586 628f8fd9dc
commit 79ff8ba273
31 changed files with 89 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osgAnimation/BasicAnimationManager.cpp
View File

@@ -22,7 +22,7 @@ BasicAnimationManager::BasicAnimationManager()
{
}
BasicAnimationManager::BasicAnimationManager(const BasicAnimationManager& b, const osg::CopyOp& copyop) :
BasicAnimationManager::BasicAnimationManager(const BasicAnimationManager& b, const osg::CopyOp& copyop) :
osg::Object(b, copyop),
osg::Callback(b, copyop),
AnimationManagerBase(b,copyop),
@@ -31,8 +31,10 @@ BasicAnimationManager::BasicAnimationManager(const BasicAnimationManager& b, con
}
BasicAnimationManager::BasicAnimationManager(const AnimationManagerBase& b, const osg::CopyOp& copyop)
: AnimationManagerBase(b,copyop)
, _lastUpdate(0.0)
: osg::Object(b, copyop),
osg::Callback(b, copyop),
AnimationManagerBase(b,copyop),
_lastUpdate(0.0)
{
}