From aba6a4b74c00a6aa88ceec7dc59d89ebd4d4247e Mon Sep 17 00:00:00 2001 From: badlogic Date: Tue, 6 Dec 2016 13:47:10 +0100 Subject: [PATCH] [lua] Ported latest AnimationState changes, see c512ee5d595076842cbb12d95a3a7f06792b81d1 --- spine-lua/AnimationState.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spine-lua/AnimationState.lua b/spine-lua/AnimationState.lua index 006e74156..bb144a2f7 100644 --- a/spine-lua/AnimationState.lua +++ b/spine-lua/AnimationState.lua @@ -327,6 +327,7 @@ function AnimationState:apply (skeleton) end end self:queueEvents(current, animationTime) + self.events = {}; current.nextAnimationLast = animationTime current.nextTrackLast = current.trackTime end @@ -374,7 +375,8 @@ function AnimationState:applyMixingFrom (entry, skeleton) end end - self:queueEvents(from, animationTime) + if (entry.mixDuration > 0) then self:queueEvents(from, animationTime) end + self.events = {}; from.nextAnimationLast = animationTime from.nextTrackLast = from.trackTime @@ -488,7 +490,6 @@ function AnimationState:queueEvents (entry, animationTime) end i = i + 1 end - self.events = {} end function AnimationState:clearTracks ()