From 40cbe8620d703eff12b3565838a29f7a9b4510d0 Mon Sep 17 00:00:00 2001
From: NathanSweet <nathan.sweet@gmail.com>
Date: Tue, 22 Nov 2016 17:49:49 +0100
Subject: [PATCH] [libgdx] During mix, use timeScale from the most current
 animation.

---
 .../src/com/esotericsoftware/spine/AnimationState.java       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java
index 467991726..bd2322270 100644
--- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java
+++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java
@@ -142,9 +142,8 @@ public class AnimationState {
 
 		from.animationLast = from.nextAnimationLast;
 		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);
 	}