Browse Source

[libgdx] During mix, use timeScale from the most current animation.

NathanSweet 8 years ago
parent
commit
40cbe8620d

+ 2 - 3
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java

@@ -142,9 +142,8 @@ public class AnimationState {
 
 
 		from.animationLast = from.nextAnimationLast;
 		from.animationLast = from.nextAnimationLast;
 		from.trackLast = from.nextTrackLast;
 		from.trackLast = from.nextTrackLast;
-		float mixingFromDelta = delta * from.timeScale;
-		from.trackTime += mixingFromDelta;
-		entry.mixTime += mixingFromDelta;
+		from.trackTime += delta * from.timeScale;
+		entry.mixTime += delta * entry.timeScale;
 
 
 		updateMixingFrom(from, delta, canEnd && from.alpha == 1);
 		updateMixingFrom(from, delta, canEnd && from.alpha == 1);
 	}
 	}