浏览代码

Fix for #1352. The last subsequent attachment timeline always mixes out to the setup pose.

badlogic 6 年之前
父节点
当前提交
603c9e2366
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4 1
      spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java

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

@@ -293,7 +293,10 @@ public class AnimationState {
 				float alpha;
 				float alpha;
 				switch (timelineMode[i] & NOT_LAST - 1) {
 				switch (timelineMode[i] & NOT_LAST - 1) {
 				case SUBSEQUENT:
 				case SUBSEQUENT:
-					if (!attachments && timeline instanceof AttachmentTimeline) continue;
+					if (!attachments && timeline instanceof AttachmentTimeline) {
+						if ((timelineMode[i] & NOT_LAST) == NOT_LAST) continue;
+						blend = MixBlend.setup;
+					}
 					if (!drawOrder && timeline instanceof DrawOrderTimeline) continue;
 					if (!drawOrder && timeline instanceof DrawOrderTimeline) continue;
 					timelineBlend = blend;
 					timelineBlend = blend;
 					alpha = alphaMix;
 					alpha = alphaMix;