[ue4] Need to temporarily disable queue draining of animation state w…

…hen setting or adding new animations. Closes #1037
EsotericSoftware · Nov 10, 2017 · 33a0018 · 33a0018
1 parent 361378b
commit 33a0018
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonAnimationComponent.cpp b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonAnimationComponent.cpp
@@ -150,10 +150,18 @@ float USpineSkeletonAnimationComponent::GetTimeScale() {
 	return 1;
 }
 
+// we need to disable the queue when setting or adding animations, see #1037
+extern "C" {
+	void _spAnimationState_disableQueue(spAnimationState* state);
+	void _spAnimationState_enableQueue(spAnimationState* state);
+}
+
 UTrackEntry* USpineSkeletonAnimationComponent::SetAnimation (int trackIndex, FString animationName, bool loop) {
 	CheckState();
 	if (state && spSkeletonData_findAnimation(skeleton->data, TCHAR_TO_UTF8(*animationName))) {
+		_spAnimationState_disableQueue(state);
 		spTrackEntry* entry = spAnimationState_setAnimationByName(state, trackIndex, TCHAR_TO_UTF8(*animationName), loop ? 1 : 0);
+		_spAnimationState_enableQueue(state);
 		UTrackEntry* uEntry = NewObject<UTrackEntry>();
 		uEntry->SetTrackEntry(entry);
 		trackEntries.Add(uEntry);
@@ -165,7 +173,9 @@ UTrackEntry* USpineSkeletonAnimationComponent::SetAnimation (int trackIndex, FSt
 UTrackEntry* USpineSkeletonAnimationComponent::AddAnimation (int trackIndex, FString animationName, bool loop, float delay) {
 	CheckState();
 	if (state && spSkeletonData_findAnimation(skeleton->data, TCHAR_TO_UTF8(*animationName))) {
+		_spAnimationState_disableQueue(state);
 		spTrackEntry* entry = spAnimationState_addAnimationByName(state, trackIndex, TCHAR_TO_UTF8(*animationName), loop ? 1 : 0, delay);		
+		_spAnimationState_enableQueue(state);
 		UTrackEntry* uEntry = NewObject<UTrackEntry>();
 		uEntry->SetTrackEntry(entry);
 		trackEntries.Add(uEntry);