Browse Source

[as3] Fix for #1352, the last subsequent attachment timeline always mixes out to the setup pose.

badlogic 6 years ago
parent
commit
6d8baa17fd

BIN
spine-as3/spine-as3-example/lib/spine-as3.swc


+ 5 - 2
spine-as3/spine-as3/src/spine/animation/AnimationState.as

@@ -246,8 +246,11 @@ package spine.animation {
 					var timelineBlend: MixBlend;
 					var alpha : Number = 0;
 					switch (timelineMode[i] & (NOT_LAST - 1)) {
-					case SUBSEQUENT:
-						if (!attachments && timeline is AttachmentTimeline) continue;
+					case SUBSEQUENT:						
+						if (!attachments && timeline is AttachmentTimeline) {
+							if ((timelineMode[i] & NOT_LAST) == NOT_LAST) continue;
+							blend = MixBlend.setup;
+						}
 						if (!drawOrder && timeline is DrawOrderTimeline) continue;
 						timelineBlend = blend;
 						alpha = alphaMix;

BIN
spine-starling/spine-starling-example/lib/spine-as3.swc


BIN
spine-starling/spine-starling/lib/spine-as3.swc