mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-02-16 12:01:41 +08:00
Merge branch '3.6' into 3.7-beta
This commit is contained in:
commit
12c9091c71
@ -899,7 +899,6 @@ spTrackEntry* _spTrackEntry_setTimelineData(spTrackEntry* self, spTrackEntry* to
|
||||
spTrackEntryArray_clear(self->timelineDipMix);
|
||||
timelineDipMix = spTrackEntryArray_setSize(self->timelineDipMix, timelinesCount)->items;
|
||||
|
||||
outer:
|
||||
for (i = 0; i < timelinesCount; i++) {
|
||||
int id = spTimeline_getPropertyId(timelines[i]);
|
||||
if (!_spAnimationState_addPropertyID(state, id))
|
||||
@ -922,5 +921,6 @@ spTrackEntry* _spTrackEntry_setTimelineData(spTrackEntry* self, spTrackEntry* to
|
||||
timelineData[i] = DIP;
|
||||
}
|
||||
}
|
||||
outer:
|
||||
return lastEntry;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user