UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.6' into 3.6

Browse Source
This commit is contained in:
NathanSweet 2017-07-31 21:39:13 +02:00
commit 83dffa7c64
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-c/spine-c/src/spine/AnimationState.c
View File

@ -899,7 +899,6 @@ spTrackEntry* _spTrackEntry_setTimelineData(spTrackEntry* self, spTrackEntry* to
spTrackEntryArray_clear(self->timelineDipMix); spTrackEntryArray_clear(self->timelineDipMix);
timelineDipMix = spTrackEntryArray_setSize(self->timelineDipMix, timelinesCount)->items; timelineDipMix = spTrackEntryArray_setSize(self->timelineDipMix, timelinesCount)->items;
outer:
for (i = 0; i < timelinesCount; i++) { for (i = 0; i < timelinesCount; i++) {
int id = spTimeline_getPropertyId(timelines[i]); int id = spTimeline_getPropertyId(timelines[i]);
if (!_spAnimationState_addPropertyID(state, id)) if (!_spAnimationState_addPropertyID(state, id))
@ -922,5 +921,6 @@ spTrackEntry* _spTrackEntry_setTimelineData(spTrackEntry* self, spTrackEntry* to
timelineData[i] = DIP; timelineData[i] = DIP;
} }
} }
outer:
return lastEntry; return lastEntry;
} }