Browse Source

[csharp] Match libGDX setTimelineData

John 8 years ago
parent
commit
f796d15f31
1 changed files with 7 additions and 4 deletions
  1. 7 4
      spine-csharp/src/AnimationState.cs

+ 7 - 4
spine-csharp/src/AnimationState.cs

@@ -708,10 +708,13 @@ namespace Spine {
 				} else {
 					for (int ii = mixingToLast; ii >= 0; ii--) {
 						var entry = mixingTo[ii];
-						if (entry.mixDuration > 0 && !entry.HasTimeline(id)) {
-							timelineDataItems[i] = AnimationState.DipMix;
-							timelineDipMixItems[i] = entry;
-							goto outer; // continue outer;
+						if (!entry.HasTimeline(id)) {
+							if (entry.mixDuration > 0) {
+								timelineDataItems[i] = AnimationState.DipMix;
+								timelineDipMixItems[i] = entry;
+								goto outer; // continue outer;
+							}
+							break;
 						}
 					}
 					timelineDataItems[i] = AnimationState.Dip;