From 882f49f5a94e03b53a34c824cca564c32324f144 Mon Sep 17 00:00:00 2001 From: Nathan Sweet Date: Sat, 28 Oct 2017 00:20:33 +0200 Subject: [PATCH] Fix not returning to setup pose when multiple mixing from entries end at same time #1024 --- .../src/com/esotericsoftware/spine/AnimationState.java | 5 +++-- 1 file changed, 3 insertions(+), 2 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 d73c26266..2b57ae887 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java @@ -244,9 +244,10 @@ public class AnimationState { if (from.mixingFrom != null) applyMixingFrom(from, skeleton, currentPose); float mix; - if (to.mixDuration == 0) // Single frame mix to undo mixingFrom changes. + if (to.mixDuration == 0) { // Single frame mix to undo mixingFrom changes. mix = 1; - else { + currentPose = MixPose.setup; + } else { mix = to.mixTime / to.mixDuration; if (mix > 1) mix = 1; }