Browse Source

Merge pull request #1089 from AtomicGameEngine/JME_ATOMIC_ANIMATIONFIX

Update for PR #1079
JoshEngebretson 9 years ago
parent
commit
7e3f33cb24
1 changed files with 7 additions and 1 deletions
  1. 7 1
      Source/Atomic/Graphics/AnimatedModel.cpp

+ 7 - 1
Source/Atomic/Graphics/AnimatedModel.cpp

@@ -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();