From be583ba96d00a2c71018c907ab8531717368e4b8 Mon Sep 17 00:00:00 2001
From: NathanSweet <nathan.sweet@gmail.com>
Date: Wed, 17 May 2017 15:23:42 +0200
Subject: [PATCH] [libgdx] Moved NaN fix when mixDuration is 0 to
 setTimelineData.

---
 .../src/com/esotericsoftware/spine/AnimationState.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java
index 4e6e0c4dd..dfb30e4f9 100644
--- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java
+++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java
@@ -248,7 +248,7 @@ public class AnimationState {
 				first = true;
 				alpha = alphaDip;
 				TrackEntry dipMix = (TrackEntry)timelineDipMix[i];
-				if (dipMix != null && dipMix.mixDuration > 0) alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
+				if (dipMix != null) alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
 				break;
 			}
 			if (timeline instanceof RotateTimeline)
@@ -730,7 +730,7 @@ public class AnimationState {
 					for (int ii = mixingToLast; ii >= 0; ii--) {
 						TrackEntry entry = (TrackEntry)mixingTo[ii];
 						if (!entry.hasTimeline(id)) {
-							timelineDipMix[i] = entry;
+							if (entry.mixDuration > 0) timelineDipMix[i] = entry;
 							continue outer;
 						}
 					}