From d67362b0ed8c3ade3072f8a936a32c502564c0ba Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Mon, 31 Jul 2023 09:58:38 +0200 Subject: [PATCH] [ue] Fix compilation for UE 5+, closes #2328 --- .../Source/SpinePlugin/Private/SpineSkeletonDataAsset.cpp | 6 +++--- .../SpinePlugin/Source/SpinePlugin/Public/SpineWidget.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonDataAsset.cpp b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonDataAsset.cpp index c306f4c55..c5923bf7f 100644 --- a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonDataAsset.cpp +++ b/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); diff --git a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineWidget.h b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineWidget.h index 0d9a5824b..20b6fb4a3 100644 --- a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineWidget.h +++ b/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