|
@@ -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;
|