UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 17:56:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

[lua] Ported AnimationState change

Browse Source
This commit is contained in:
badlogic 2017-04-10 15:46:40 +02:00
parent 14c1df8cfb
commit c7ca217d52
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spine-lua/AnimationState.lua
View File

@ -303,10 +303,10 @@ function AnimationState:apply (skeleton)
-- Apply mixing from entries first. -- Apply mixing from entries first.
local mix = current.alpha local mix = current.alpha
if current.mixingFrom then if current.mixingFrom then
mix = mix * self:applyMixingFrom(current, skeleton) mix = mix * self:applyMixingFrom(current, skeleton)
elseif current.trackTime >= current.trackEnd then elseif current.trackTime >= current.trackEnd and current.next == nil then
mix = 0 mix = 0
end end
-- Apply current entry. -- Apply current entry.
local animationLast = current.animationLast local animationLast = current.animationLast