From 76f8d683faa0696e059c360957949aae50dcc16b Mon Sep 17 00:00:00 2001
From: badlogic <badlogicgames@gmail.com>
Date: Mon, 10 Apr 2017 12:11:33 +0200
Subject: [PATCH] [lua] Fixed dipping fix

---
 spine-lua/AnimationState.lua | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/spine-lua/AnimationState.lua b/spine-lua/AnimationState.lua
index d015b5cba..d85aa89f8 100644
--- a/spine-lua/AnimationState.lua
+++ b/spine-lua/AnimationState.lua
@@ -371,7 +371,7 @@ function AnimationState:applyMixingFrom (entry, skeleton)
 	for i,timeline in ipairs(timelines) do
 		local setupPose = timelinesFirst[i]
 		local alpha = 1;
-		if (timelinesLast ~= nil and setupPose and not timlinesLast[i]) then
+		if (timelinesLast ~= nil and setupPose and not timelinesLast[i]) then
 			alpha = alphaBase
 		else
 			alpha = alphaMix
@@ -396,7 +396,10 @@ function AnimationState:applyMixingFrom (entry, skeleton)
 end
 
 function AnimationState:applyRotateTimeline (timeline, skeleton, time, alpha, setupPose, timelinesRotation, i, firstFrame)
-	if firstFrame then timelinesRotation[i] = 0 end
+	if firstFrame then 
+		timelinesRotation[i] = 0
+		timelinesRotation[i+1] = 0
+	end
 	
   if alpha == 1 then
     timeline:apply(skeleton, 0, time, nil, 1, setupPose, false)
@@ -554,18 +557,18 @@ function AnimationState:setCurrent (index, current, interrupt)
 		
 		local mixingFrom = from.mixingFrom
 		if (mixingFrom ~= nil and from.mixDuration > 0) then
-			if (not self.multipleMixing and from.mixTime / from.mixDuration < 0.5 and mixingFrom.animation ~= EMPTY_ANIMATION) then
-				current.mixingFrom = mixingFrom
-				mixingFrom.mixingFrom = from
-				mixingFrom.mixTime = from.mixDuration - from.mixTime
-				mixingFrom.mixDuration = from.mixDuration
-				from.mixingFrom = nil
-				from = mixingFrom
-			end
+			if (self.multipleMixing) then
+				current.mixAlpha = current.mixAlpha * math_min(from.mixTime / from.mixDuration, 1)
+			else
+				if (from.mixTime / from.mixDuration < 0.5 and mixingFrom.animation ~= EMPTY_ANIMATION) then
+					current.mixingFrom = mixingFrom
+					mixingFrom.mixingFrom = from
+					mixingFrom.mixTime = from.mixDuration - from.mixTime
+					mixingFrom.mixDuration = from.mixDuration
+					from.mixingFrom = nil
+					from = mixingFrom
+				end
 
-			current.mixAlpha = current.mixAlpha * math_min(from.mixTime / from.mixDuration, 1)
-
-			if (not self.multipleMixing) then
 				from.mixAlpha = 0;
 				from.mixTime = 0;
 				from.mixDuration = 0;