Parcourir la source

Merge branch '3.6' of https://github.com/EsotericSoftware/spine-runtimes into 3.6

pharan il y a 7 ans
Parent
commit
a4361cae91

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

@@ -53,7 +53,8 @@ static void * SpineRealloc( void* ptr, size_t size ) {
 }
 
 void FSpinePlugin::StartupModule() {
-#if !UE_EDITOR
+	// Needed for consoles, see https://github.com/EsotericSoftware/spine-runtimes/pull/1089
+#if !UE_EDITOR && !PLATFORM_WINDOWS && !PLATFORM_MAC && !PLATFORM_LINUX && !PLATFORM_IOS && !PLATFORM_ANDROID && !PLATFORM_HTML5
     _spSetMalloc( &SpineMalloc );
     _spSetRealloc( &SpineRealloc );
     _spSetFree( FMemory::Free );