From 1da43a5960da849a7230ecdd3ba5bddcd47f7023 Mon Sep 17 00:00:00 2001 From: Laurens Voerman Date: Mon, 29 Aug 2016 13:03:36 +0200 Subject: [PATCH] added copyconstructor for osgAnimation::BasicAnimationManager --- include/osgAnimation/BasicAnimationManager | 1 + src/osgAnimation/BasicAnimationManager.cpp | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/include/osgAnimation/BasicAnimationManager b/include/osgAnimation/BasicAnimationManager index c753f6ca8..b839f81a5 100644 --- a/include/osgAnimation/BasicAnimationManager +++ b/include/osgAnimation/BasicAnimationManager @@ -29,6 +29,7 @@ namespace osgAnimation META_Object(osgAnimation, BasicAnimationManager); BasicAnimationManager(); + BasicAnimationManager(const BasicAnimationManager& b, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY); BasicAnimationManager(const AnimationManagerBase& b, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY); virtual ~BasicAnimationManager(); diff --git a/src/osgAnimation/BasicAnimationManager.cpp b/src/osgAnimation/BasicAnimationManager.cpp index f42bea7e0..02e6692e4 100644 --- a/src/osgAnimation/BasicAnimationManager.cpp +++ b/src/osgAnimation/BasicAnimationManager.cpp @@ -22,6 +22,14 @@ BasicAnimationManager::BasicAnimationManager() { } +BasicAnimationManager::BasicAnimationManager(const BasicAnimationManager& b, const osg::CopyOp& copyop) : + osg::Object(b, copyop), + osg::Callback(b, copyop), + AnimationManagerBase(b,copyop, + _lastUpdate(0.0) +{ +} + BasicAnimationManager::BasicAnimationManager(const AnimationManagerBase& b, const osg::CopyOp& copyop) : AnimationManagerBase(b,copyop) , _lastUpdate(0.0)