Merge branch '3.6' into 3.7-beta

EsotericSoftware · Nov 13, 2017 · 98261fa · 98261fa
2 parents ac588a6 + adb11a2
commit 98261fa
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/spine-c/spine-c/src/spine/AnimationState.c b/spine-c/spine-c/src/spine/AnimationState.c
@@ -180,6 +180,17 @@ void _spEventQueue_drain (_spEventQueue* self) {
 	self->drainDisabled = 0;
 }
 
+// These two functions are needed in the UE4 runtime, see #1037
+void _spAnimationState_enableQueue(spAnimationState* self) {
+	_spAnimationState* internal = SUB_CAST(_spAnimationState, self);
+	internal->queue->drainDisabled = 0;
+}
+
+void _spAnimationState_disableQueue(spAnimationState* self) {
+	_spAnimationState* internal = SUB_CAST(_spAnimationState, self);
+	internal->queue->drainDisabled = 1;
+}
+
 void _spAnimationState_disposeTrackEntry (spTrackEntry* entry) {
 	spIntArray_dispose(entry->timelineData);
 	spTrackEntryArray_dispose(entry->timelineDipMix);