From fd81d31278dadf687752369f88464730ffb00198 Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Tue, 23 Aug 2016 17:38:37 +0200 Subject: [PATCH] Fixed resetTrack when a default mix time is used. --- .../src/com/esotericsoftware/spine/AnimationState.java | 2 ++ 1 file changed, 2 insertions(+) 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 f48055a9b..f319791c3 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java @@ -293,6 +293,7 @@ public class AnimationState { private void resetTrack (TrackEntry current) { TrackEntry entry = trackEntry(current.trackIndex, emptyAnimation, false, current); + entry.mixDuration = 0; current.trackTime = 0; setCurrent(current.trackIndex, entry); } @@ -394,6 +395,7 @@ public class AnimationState { * after {@link AnimationStateListener#end(TrackEntry)}. */ public TrackEntry setAnimation (int trackIndex, Animation animation, boolean loop) { if (animation == null) throw new IllegalArgumentException("animation cannot be null."); + // if (animation == null) animation = emptyAnimation; // BOZO - Test. TrackEntry current = expandToIndex(trackIndex); if (current != null) { if (current.nextTrackLast == -1) {