From e9a9b15f349674a4785745f30021ed0345ebef70 Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Thu, 11 Dec 2014 03:15:39 +0100 Subject: [PATCH] No need to check mix == 1. --- .../src/com/esotericsoftware/spine/AnimationState.java | 9 +++------ 1 file changed, 3 insertions(+), 6 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 6872822f1..09f170e75 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java @@ -94,12 +94,9 @@ public class AnimationState { if (!loop && time > endTime) time = endTime; TrackEntry previous = current.previous; - if (previous == null) { - if (current.mix == 1) - current.animation.apply(skeleton, lastTime, time, loop, events); - else - current.animation.mix(skeleton, lastTime, time, loop, events, current.mix); - } else { + if (previous == null) + current.animation.mix(skeleton, lastTime, time, loop, events, current.mix); + else { float previousTime = previous.time; if (!previous.loop && previousTime > previous.endTime) previousTime = previous.endTime; previous.animation.apply(skeleton, previousTime, previousTime, previous.loop, null);