From 7b0d71568b79bc486fcb486c0e725a81d46c4868 Mon Sep 17 00:00:00 2001 From: badlogic Date: Sat, 19 Jun 2021 15:43:33 +0200 Subject: [PATCH] [ue4] Set mixes on native Spine data upon retrieval via Atlas. Closes #1772 --- .../Source/SpinePlugin/Private/SpineSkeletonDataAsset.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonDataAsset.cpp b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonDataAsset.cpp index 8dd9b7e33..fb84d8798 100644 --- a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonDataAsset.cpp +++ b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonDataAsset.cpp @@ -327,8 +327,11 @@ void USpineSkeletonDataAsset::SetMixes(AnimationStateData* animationStateData) { animationStateData->setDefaultMix(DefaultMix); } -AnimationStateData* USpineSkeletonDataAsset::GetAnimationStateData(Atlas* atlas) { - return atlasToNativeData.Contains(atlas) ? atlasToNativeData[atlas].animationStateData : nullptr; +AnimationStateData* USpineSkeletonDataAsset::GetAnimationStateData(Atlas* atlas) { + if (!atlasToNativeData.Contains(atlas)) return nullptr; + AnimationStateData *data = atlasToNativeData[atlas].animationStateData; + SetMixes(data); + return data; } void USpineSkeletonDataAsset::SetMix(const FString& from, const FString& to, float mix) {