From 2c5db07f07f3ce1ce83a30e3618b1058eac8fd6a Mon Sep 17 00:00:00 2001
From: NathanSweet <nathan.sweet@gmail.com>
Date: Wed, 23 Apr 2014 15:35:58 +0200
Subject: [PATCH] Fixed mixing two animations using different time scales.

---
 spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java b/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java
index 1b281b231..637ad2589 100644
--- a/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java
+++ b/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java
@@ -62,7 +62,7 @@ public class AnimationState {
 			float trackDelta = delta * current.timeScale;
 			current.time += trackDelta;
 			if (current.previous != null) {
-				current.previous.time += trackDelta;
+				current.previous.time += delta * current.previous.timeScale;
 				current.mixTime += trackDelta;
 			}