UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.7-beta' into 3.7-beta-cpp

Browse Source
This commit is contained in:
badlogic 2018-09-11 16:40:20 +02:00
commit 92eef7f9f1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spine-lua/AnimationState.lua
View File

@ -820,16 +820,16 @@ function AnimationState:setTimelineModes(entry)
local skip local skip
while i <= timelinesCount do while i <= timelinesCount do
local id = "" .. timelines[i]:getPropertyId() local id = "" .. timelines[i]:getPropertyId()
if not (propertyIDs[id] == nil) then if propertyIDs[id] then
timelineMode[i] = SUBSEQUENT timelineMode[i] = SUBSEQUENT
else else
propertyIDs[id] = id propertyIDs[id] = id
if (to == nil or not self:hasTimeline(to, id)) then if to == nil or not self:hasTimeline(to, id) then
timelineMode[i] = FIRST timelineMode[i] = FIRST
else else
local next = to.mixingTo local next = to.mixingTo
skip = false
while next do while next do
skip = false
if not self:hasTimeline(id) then if not self:hasTimeline(id) then
if entry.mixDuration > 0 then if entry.mixDuration > 0 then
timelineMode[i] = HOLD_MIX timelineMode[i] = HOLD_MIX