浏览代码

[ue4] Set mixes on native Spine data upon retrieval via Atlas. Closes #1772

badlogic 4 年之前
父节点
当前提交
7b0d71568b
共有 1 个文件被更改,包括 5 次插入2 次删除
  1. 5 2
      spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonDataAsset.cpp

+ 5 - 2
spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonDataAsset.cpp

@@ -327,8 +327,11 @@ void USpineSkeletonDataAsset::SetMixes(AnimationStateData* animationStateData) {
 	animationStateData->setDefaultMix(DefaultMix);
 	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) {
 void USpineSkeletonDataAsset::SetMix(const FString& from, const FString& to, float mix) {