From 8e9d54b3ad731bd743a24a533364afd4e670055b Mon Sep 17 00:00:00 2001 From: badlogic Date: Fri, 2 Dec 2016 15:42:31 +0100 Subject: [PATCH] [lua] Ported latest AnimationState changes. See #792 --- spine-lua/AnimationState.lua | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/spine-lua/AnimationState.lua b/spine-lua/AnimationState.lua index f7cee2958..006e74156 100644 --- a/spine-lua/AnimationState.lua +++ b/spine-lua/AnimationState.lua @@ -541,7 +541,7 @@ function AnimationState:setCurrent (index, current, interrupt) from.timelinesRotation = {}; -- If not completely mixed in, set mixAlpha so mixing out happens from current mix to zero. - if from.mixingFrom then current.mixAlpha = current.mixAlpha * math_min(from.mixTime / from.mixDuration, 1) end + if from.mixingFrom and from.mixDuration > 0 then current.mixAlpha = current.mixAlpha * math_min(from.mixTime / from.mixDuration, 1) end end queue:start(current) @@ -665,11 +665,7 @@ function AnimationState:trackEntry (trackIndex, animation, loop, last) entry.trackTime = 0 entry.trackLast = -1 entry.nextTrackLast = -1 - if loop then - entry.trackEnd = 999999999 - else - entry.trackEnd = entry.animationEnd - end + entry.trackEnd = 999999999 entry.timeScale = 1 entry.alpha = 1