Merge branch '3.6' into 3.7-beta

This commit is contained in:
badlogic 2017-11-13 14:06:34 +01:00
commit 98261fa480

View File

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