[as3][ts] Moved mix duration fix to setTimelineData so we evaluate the boolean expression less.

spine-as3/spine-as3/src/spine/animation/AnimationState.as

@@ -237,7 +237,7 @@ package spine.animation {
 					first = true;
 					alpha = alphaDip;
 					var 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 is RotateTimeline)

spine-as3/spine-as3/src/spine/animation/TrackEntry.as

@@ -106,7 +106,7 @@ package spine.animation {
 					for (var ii : int = mixingToLast; ii >= 0; ii--) {
 						var entry : TrackEntry = mixingTo[ii];
 						if (!entry.hasTimeline(intId)) {
-							timelineDipMix[i] = entry;
+							if (entry.mixDuration > 0) timelineDipMix[i] = entry;
 							continue outer;
 						}
 					}

spine-ts/build/spine-all.js

@@ -1215,7 +1215,7 @@ var spine;
 						first = true;
 						alpha = alphaDip;
 						var dipMix = timelineDipMix[i];
-						if (dipMix != null && dipMix.mixDuration > 0)
+						if (dipMix != null)
 							alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
 						break;
 				}
@@ -1569,7 +1569,8 @@ var spine;
 					for (var ii = mixingToLast; ii >= 0; ii--) {
 						var entry = mixingTo[ii];
 						if (!entry.hasTimeline(id)) {
-							timelineDipMix[i] = entry;
+							if (entry.mixDuration > 0)
+								timelineDipMix[i] = entry;
 							continue outer;
 						}
 					}

spine-ts/build/spine-canvas.js

@@ -1215,7 +1215,7 @@ var spine;
 						first = true;
 						alpha = alphaDip;
 						var dipMix = timelineDipMix[i];
-						if (dipMix != null && dipMix.mixDuration > 0)
+						if (dipMix != null)
 							alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
 						break;
 				}
@@ -1569,7 +1569,8 @@ var spine;
 					for (var ii = mixingToLast; ii >= 0; ii--) {
 						var entry = mixingTo[ii];
 						if (!entry.hasTimeline(id)) {
-							timelineDipMix[i] = entry;
+							if (entry.mixDuration > 0)
+								timelineDipMix[i] = entry;
 							continue outer;
 						}
 					}

spine-ts/build/spine-core.js

@@ -1215,7 +1215,7 @@ var spine;
 						first = true;
 						alpha = alphaDip;
 						var dipMix = timelineDipMix[i];
-						if (dipMix != null && dipMix.mixDuration > 0)
+						if (dipMix != null)
 							alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
 						break;
 				}
@@ -1569,7 +1569,8 @@ var spine;
 					for (var ii = mixingToLast; ii >= 0; ii--) {
 						var entry = mixingTo[ii];
 						if (!entry.hasTimeline(id)) {
-							timelineDipMix[i] = entry;
+							if (entry.mixDuration > 0)
+								timelineDipMix[i] = entry;
 							continue outer;
 						}
 					}

spine-ts/build/spine-threejs.js

@@ -1215,7 +1215,7 @@ var spine;
 						first = true;
 						alpha = alphaDip;
 						var dipMix = timelineDipMix[i];
-						if (dipMix != null && dipMix.mixDuration > 0)
+						if (dipMix != null)
 							alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
 						break;
 				}
@@ -1569,7 +1569,8 @@ var spine;
 					for (var ii = mixingToLast; ii >= 0; ii--) {
 						var entry = mixingTo[ii];
 						if (!entry.hasTimeline(id)) {
-							timelineDipMix[i] = entry;
+							if (entry.mixDuration > 0)
+								timelineDipMix[i] = entry;
 							continue outer;
 						}
 					}

spine-ts/build/spine-webgl.js

@@ -1215,7 +1215,7 @@ var spine;
 						first = true;
 						alpha = alphaDip;
 						var dipMix = timelineDipMix[i];
-						if (dipMix != null && dipMix.mixDuration > 0)
+						if (dipMix != null)
 							alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
 						break;
 				}
@@ -1569,7 +1569,8 @@ var spine;
 					for (var ii = mixingToLast; ii >= 0; ii--) {
 						var entry = mixingTo[ii];
 						if (!entry.hasTimeline(id)) {
-							timelineDipMix[i] = entry;
+							if (entry.mixDuration > 0)
+								timelineDipMix[i] = entry;
 							continue outer;
 						}
 					}

spine-ts/build/spine-widget.js

@@ -1215,7 +1215,7 @@ var spine;
 						first = true;
 						alpha = alphaDip;
 						var dipMix = timelineDipMix[i];
-						if (dipMix != null && dipMix.mixDuration > 0)
+						if (dipMix != null)
 							alpha *= Math.max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
 						break;
 				}
@@ -1569,7 +1569,8 @@ var spine;
 					for (var ii = mixingToLast; ii >= 0; ii--) {
 						var entry = mixingTo[ii];
 						if (!entry.hasTimeline(id)) {
-							timelineDipMix[i] = entry;
+							if (entry.mixDuration > 0)
+								timelineDipMix[i] = entry;
 							continue outer;
 						}
 					}

spine-ts/core/src/AnimationState.ts

@@ -220,7 +220,7 @@ module spine {
 					first = true;
 					alpha = alphaDip;
 					let dipMix = 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)
@@ -613,7 +613,7 @@ module spine {
 					for (var ii = mixingToLast; ii >= 0; ii--) {
 						let entry = mixingTo[ii];
 						if (!entry.hasTimeline(id)) {
-							timelineDipMix[i] = entry;
+							if (entry.mixDuration > 0) timelineDipMix[i] = entry;
 							continue outer;
 						}
 					}