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

EsotericSoftware · Jul 31, 2017 · 83dffa7 · 83dffa7
2 parents 942fb49 + 3b61897
commit 83dffa7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/spine-c/spine-c/src/spine/AnimationState.c b/spine-c/spine-c/src/spine/AnimationState.c
@@ -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;
 }