Browse Source

[ue] Fix compilation for UE 5+, closes #2328

Mario Zechner 2 years ago
parent
commit
d67362b0ed

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

@@ -318,9 +318,9 @@ SkeletonData *USpineSkeletonDataAsset::GetSkeletonData(Atlas *Atlas) {
 void USpineSkeletonDataAsset::SetMixes(AnimationStateData *animationStateData) {
 	for (auto &data : MixData) {
 		if (!data.From.IsEmpty() && !data.To.IsEmpty()) {
-			const char *fromChar = TCHAR_TO_UTF8(*data.From);
-			const char *toChar = TCHAR_TO_UTF8(*data.To);
-			animationStateData->setMix(fromChar, toChar, data.Mix);
+			std::string fromChar = TCHAR_TO_UTF8(*data.From);
+			std::string toChar = TCHAR_TO_UTF8(*data.To);
+			animationStateData->setMix(fromChar.c_str(), toChar.c_str(), data.Mix);
 		}
 	}
 	animationStateData->setDefaultMix(DefaultMix);

+ 1 - 0
spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineWidget.h

@@ -33,6 +33,7 @@
 #include "Runtime/UMG/Public/UMG.h"
 #include "Runtime/UMG/Public/UMGStyle.h"
 #include "SpineSkeletonDataAsset.h"
+#include "SpineSkeletonAnimationComponent.h"
 #include "spine/spine.h"
 #include "SpineWidget.generated.h"
 // clang-format on