Преглед изворни кода

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

badlogic пре 7 година
родитељ
комит
92eef7f9f1
1 измењених фајлова са 3 додато и 3 уклоњено
  1. 3 3
      spine-lua/AnimationState.lua

+ 3 - 3
spine-lua/AnimationState.lua

@@ -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