Browse Source

Merge branch '3.7' into 3.8-beta

NathanSweet 6 years ago
parent
commit
ae8adb9fab

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

@@ -230,7 +230,7 @@ public class AnimationState {
 			} else {
 				int[] timelineMode = current.timelineMode.items;
 
-				boolean firstFrame = current.timelinesRotation.size == 0;
+				boolean firstFrame = current.timelinesRotation.size != timelineCount << 1;
 				if (firstFrame) current.timelinesRotation.setSize(timelineCount << 1);
 				float[] timelinesRotation = current.timelinesRotation.items;
 
@@ -282,7 +282,7 @@ public class AnimationState {
 			int[] timelineMode = from.timelineMode.items;
 			Object[] timelineHoldMix = from.timelineHoldMix.items;
 
-			boolean firstFrame = from.timelinesRotation.size == 0;
+			boolean firstFrame = from.timelinesRotation.size != timelineCount << 1;
 			if (firstFrame) from.timelinesRotation.setSize(timelineCount << 1);
 			float[] timelinesRotation = from.timelinesRotation.items;