Sfoglia il codice sorgente

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

badlogic 6 anni fa
parent
commit
d95bc83e07
1 ha cambiato i file con 4 aggiunte e 1 eliminazioni
  1. 4 1
      spine-c/spine-c/src/spine/AnimationState.c

+ 4 - 1
spine-c/spine-c/src/spine/AnimationState.c

@@ -468,7 +468,10 @@ float _spAnimationState_applyMixingFrom (spAnimationState* self, spTrackEntry* t
 
 
 			switch (timelineMode->items[i] & (NOT_LAST - 1)) {
 			switch (timelineMode->items[i] & (NOT_LAST - 1)) {
 				case SUBSEQUENT:
 				case SUBSEQUENT:
-					if (!attachments && timeline->type == SP_TIMELINE_ATTACHMENT) continue;
+					if (!attachments && timeline->type == SP_TIMELINE_ATTACHMENT) {
+						if ((timelineMode->items[i] & NOT_LAST) == NOT_LAST) continue;
+						blend = SP_MIX_BLEND_SETUP;
+					}
 					if (!drawOrder && timeline->type == SP_TIMELINE_DRAWORDER) continue;
 					if (!drawOrder && timeline->type == SP_TIMELINE_DRAWORDER) continue;
 					timelineBlend = blend;
 					timelineBlend = blend;
 					alpha = alphaMix;
 					alpha = alphaMix;