From a503b143cc44ba5fb8f72f04aa3f20e21564902a Mon Sep 17 00:00:00 2001 From: Cedric Pinson Date: Mon, 24 Jan 2011 11:45:45 +0000 Subject: [PATCH] From Michael Platings, Fix animation duration when adding channel to animation --- src/osgAnimation/Animation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osgAnimation/Animation.cpp b/src/osgAnimation/Animation.cpp index 02d014f28..47174135d 100644 --- a/src/osgAnimation/Animation.cpp +++ b/src/osgAnimation/Animation.cpp @@ -34,7 +34,7 @@ Animation::Animation(const osgAnimation::Animation& anim, const osg::CopyOp& cop void Animation::addChannel(Channel* pChannel) { _channels.push_back(pChannel); - if (!_duration) + if (_duration == _originalDuration) computeDuration(); else _originalDuration = computeDurationFromChannels();