diff --git a/spine-as3/spine-as3-example/lib/spine-as3.swc b/spine-as3/spine-as3-example/lib/spine-as3.swc index 845849fdc..627fc635a 100644 Binary files a/spine-as3/spine-as3-example/lib/spine-as3.swc and b/spine-as3/spine-as3-example/lib/spine-as3.swc differ diff --git a/spine-as3/spine-as3/src/spine/animation/AnimationState.as b/spine-as3/spine-as3/src/spine/animation/AnimationState.as index a2f38057e..2c1cc65f9 100644 --- a/spine-as3/spine-as3/src/spine/animation/AnimationState.as +++ b/spine-as3/spine-as3/src/spine/animation/AnimationState.as @@ -241,6 +241,7 @@ package spine.animation { from.totalAlpha = 0; for (i = 0; i < timelineCount; i++) { var timeline : Timeline = timelines[i]; + var direction : MixDirection = MixDirection.Out; var timelineBlend: MixBlend; var alpha : Number = 0; switch (timelineMode[i]) { @@ -267,8 +268,15 @@ package spine.animation { from.totalAlpha += alpha; if (timeline is RotateTimeline) applyRotateTimeline(timeline, skeleton, animationTime, alpha, timelineBlend, timelinesRotation, i << 1, firstFrame); - else { - timeline.apply(skeleton, animationLast, animationTime, events, alpha, timelineBlend, MixDirection.Out); + else { + if (timelineBlend == MixBlend.setup) { + if (timeline is AttachmentTimeline) { + if (attachments) direction = MixDirection.In; + } else if (timeline is DrawOrderTimeline) { + if (drawOrder) direction = MixDirection.In; + } + } + timeline.apply(skeleton, animationLast, animationTime, events, alpha, timelineBlend, direction); } } } diff --git a/spine-starling/spine-starling-example/lib/spine-as3.swc b/spine-starling/spine-starling-example/lib/spine-as3.swc index 845849fdc..627fc635a 100644 Binary files a/spine-starling/spine-starling-example/lib/spine-as3.swc and b/spine-starling/spine-starling-example/lib/spine-as3.swc differ diff --git a/spine-starling/spine-starling/lib/spine-as3.swc b/spine-starling/spine-starling/lib/spine-as3.swc index 845849fdc..627fc635a 100644 Binary files a/spine-starling/spine-starling/lib/spine-as3.swc and b/spine-starling/spine-starling/lib/spine-as3.swc differ