Merge remote-tracking branch 'origin/master'

spine-lua/Animation.lua

@@ -36,7 +36,7 @@ function Animation.new (name, timelines, duration)
 	function self:apply (skeleton, time, loop)
 		if not skeleton then error("skeleton cannot be nil.", 2) end
 
-		if loop and duration then time = time % duration end
+		if loop and duration > 0 then time = time % duration end
 
 		for i,timeline in ipairs(self.timelines) do
 			timeline:apply(skeleton, time, 1)
@@ -46,7 +46,7 @@ function Animation.new (name, timelines, duration)
 	function self:mix (skeleton, time, loop, alpha)
 		if not skeleton then error("skeleton cannot be nil.", 2) end
 
-		if loop and duration then time = time % duration end
+		if loop and duration > 0 then time = time % duration end
 
 		for i,timeline in ipairs(self.timelines) do
 			timeline:apply(skeleton, time, alpha)
@@ -372,7 +372,7 @@ function Animation.ColorTimeline.new ()
 		local b = lastFrameB + (frames[frameIndex + FRAME_B] - lastFrameB) * percent
 		local a = lastFrameA + (frames[frameIndex + FRAME_A] - lastFrameA) * percent
 		if alpha < 1 then
-			slot:setColor(slot.r + (r - color.r) * alpha, slot.g + (g - color.g) * alpha, slot.b + (b - color.b) * alpha, slot.a + (a - color.a) * alpha)
+			slot:setColor(slot.r + (r - slot.r) * alpha, slot.g + (g - slot.g) * alpha, slot.b + (b - slot.b) * alpha, slot.a + (a - slot.a) * alpha)
 		else
 			slot:setColor(r, g, b, a)
 		end