|
@@ -1364,7 +1364,13 @@ void AnimatedModel::UpdateAnimation(const FrameInfo& frame)
|
|
|
// (first AnimatedModel in a node)
|
|
// (first AnimatedModel in a node)
|
|
|
if (isMaster_)
|
|
if (isMaster_)
|
|
|
{
|
|
{
|
|
|
- skeleton_.ResetSilent();
|
|
|
|
|
|
|
+
|
|
|
|
|
+ // ATOMIC BEGIN
|
|
|
|
|
+ // Do not reset the skeleton as this is causing some visual artifacts with transitions
|
|
|
|
|
+ // TODO: a reproduction case? Perhaps this is an issue with specific exports/bone animations?
|
|
|
|
|
+ // skeleton_.ResetSilent();
|
|
|
|
|
+ // ATOMIC END
|
|
|
|
|
+
|
|
|
for (Vector<SharedPtr<AnimationState> >::Iterator i = animationStates_.Begin(); i != animationStates_.End(); ++i)
|
|
for (Vector<SharedPtr<AnimationState> >::Iterator i = animationStates_.Begin(); i != animationStates_.End(); ++i)
|
|
|
(*i)->Apply();
|
|
(*i)->Apply();
|
|
|
|
|
|