From 28fd5aff095ac05c35de0e9291f1a3cc28282183 Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Mon, 23 Oct 2017 18:30:46 +0200 Subject: [PATCH] [libgdx] Don't use the dip fix if mixing is complete. closes #1024 --- .../com/esotericsoftware/spine/AnimationState.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 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 376f613ae..d011999bb 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java @@ -281,13 +281,17 @@ public class AnimationState { break; case DIP: pose = MixPose.setup; - alpha = alphaDip; + alpha = mix == 1 ? 0 : alphaDip; break; default: pose = MixPose.setup; - alpha = alphaDip; - TrackEntry dipMix = (TrackEntry)timelineDipMix[i]; - alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration); + if (mix == 1) + alpha = 0; + else { + alpha = alphaDip; + TrackEntry dipMix = (TrackEntry)timelineDipMix[i]; + alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration); + } break; } from.totalAlpha += alpha;