From 81d7c1daeb95b99e692d26a3c1e80dbbd904c25d Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Wed, 24 Aug 2016 22:27:02 +0200 Subject: [PATCH] Never prefer empty animation when interrupting a mix. --- .../src/com/esotericsoftware/spine/AnimationState.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 fa14f4814..f83e8b159 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java @@ -274,7 +274,8 @@ public class AnimationState { queue.interrupt(current); // If a mix is in progress, mix from the closest animation. - if (mixingFrom != null && (current.mixDuration == 0 || current.mixTime / current.mixDuration < 0.5f)) { + if (mixingFrom != null && mixingFrom.animation != emptyAnimation + && (current.mixDuration == 0 || current.mixTime / current.mixDuration < 0.5f)) { entry.mixingFrom = mixingFrom; mixingFrom = current; } else