From ecedff1ffaf76ca2865020b9baa6767f4d3e532b Mon Sep 17 00:00:00 2001 From: Nathan Sweet Date: Sat, 28 Oct 2017 18:11:41 +0200 Subject: [PATCH] Can only use #1024 fix on track 0. --- .../src/com/esotericsoftware/spine/AnimationState.java | 4 ++-- 1 file changed, 2 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 4ca5a3556..3506341e0 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java @@ -249,11 +249,11 @@ public class AnimationState { float mix; if (to.mixDuration == 0) { // Single frame mix to undo mixingFrom changes. mix = 1; - blend = MixBlend.setup; + if (blend == MixBlend.first) blend = MixBlend.setup; // Tracks >0 are transparent and can't reset to setup pose. } else { mix = to.mixTime / to.mixDuration; if (mix > 1) mix = 1; - if (blend != MixBlend.first) blend = from.mixBlend; + if (blend != MixBlend.first) blend = from.mixBlend; // Track 0 ignores track mix blend. } Array events = mix < from.eventThreshold ? this.events : null;