Эх сурвалжийг харах

Merge branch 'dev' of https://github.com/esotericsoftware/spine-runtimes into dev

badlogic 9 жил өмнө
parent
commit
ae1b449f58

+ 4 - 4
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java

@@ -583,7 +583,7 @@ public class AnimationState {
 	private void setTimelinesFirst (TrackEntry entry) {
 	private void setTimelinesFirst (TrackEntry entry) {
 		if (entry.mixingFrom != null) {
 		if (entry.mixingFrom != null) {
 			setTimelinesFirst(entry.mixingFrom);
 			setTimelinesFirst(entry.mixingFrom);
-			checkTimelinesUsage(entry, entry.timelinesFirst);
+			checkTimelinesUsage(entry);
 			return;
 			return;
 		}
 		}
 		IntSet propertyIDs = this.propertyIDs;
 		IntSet propertyIDs = this.propertyIDs;
@@ -599,14 +599,14 @@ public class AnimationState {
 	/** From last to first mixingFrom entries, calls checkTimelineUsage. */
 	/** From last to first mixingFrom entries, calls checkTimelineUsage. */
 	private void checkTimelinesFirst (TrackEntry entry) {
 	private void checkTimelinesFirst (TrackEntry entry) {
 		if (entry.mixingFrom != null) checkTimelinesFirst(entry.mixingFrom);
 		if (entry.mixingFrom != null) checkTimelinesFirst(entry.mixingFrom);
-		checkTimelinesUsage(entry, entry.timelinesFirst);
+		checkTimelinesUsage(entry);
 	}
 	}
 
 
-	private void checkTimelinesUsage (TrackEntry entry, BooleanArray usageArray) {
+	private void checkTimelinesUsage (TrackEntry entry) {
 		IntSet propertyIDs = this.propertyIDs;
 		IntSet propertyIDs = this.propertyIDs;
 		int n = entry.animation.timelines.size;
 		int n = entry.animation.timelines.size;
 		Object[] timelines = entry.animation.timelines.items;
 		Object[] timelines = entry.animation.timelines.items;
-		boolean[] usage = usageArray.setSize(n);
+		boolean[] usage = entry.timelinesFirst.setSize(n);
 		for (int i = 0; i < n; i++)
 		for (int i = 0; i < n; i++)
 			usage[i] = propertyIDs.add(((Timeline)timelines[i]).getPropertyId());
 			usage[i] = propertyIDs.add(((Timeline)timelines[i]).getPropertyId());
 	}
 	}