From 45e3da3f909e3bd6b7a35d481b842c65a8624a6b Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Fri, 8 Oct 2021 17:03:11 +0200 Subject: [PATCH] Fix compilation issues --- Source/Engine/Graphics/Materials/ParticleMaterialShader.h | 2 ++ Source/Engine/Scripting/BinaryModule.cpp | 4 ++-- Source/Platforms/PS4 | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) create mode 160000 Source/Platforms/PS4 diff --git a/Source/Engine/Graphics/Materials/ParticleMaterialShader.h b/Source/Engine/Graphics/Materials/ParticleMaterialShader.h index 69e406749..09618f375 100644 --- a/Source/Engine/Graphics/Materials/ParticleMaterialShader.h +++ b/Source/Engine/Graphics/Materials/ParticleMaterialShader.h @@ -30,8 +30,10 @@ private: return &Distortion; case DrawPass::Forward: return &Default; +#if USE_EDITOR case DrawPass::QuadOverdraw: return &QuadOverdraw; +#endif default: return nullptr; } diff --git a/Source/Engine/Scripting/BinaryModule.cpp b/Source/Engine/Scripting/BinaryModule.cpp index 3b9d5a620..c4f58274a 100644 --- a/Source/Engine/Scripting/BinaryModule.cpp +++ b/Source/Engine/Scripting/BinaryModule.cpp @@ -912,7 +912,7 @@ void ManagedBinaryModule::InitType(MClass* mclass) void* interfaceIt = nullptr; int32 interfacesCount = 0; MonoClass* klass = mclass->GetNative(); - while (interfaceKlass = mono_class_get_interfaces(klass, &interfaceIt)) + while ((interfaceKlass = mono_class_get_interfaces(klass, &interfaceIt))) { const ScriptingTypeHandle interfaceType = FindType(interfaceKlass); if (interfaceType) @@ -924,7 +924,7 @@ void ManagedBinaryModule::InitType(MClass* mclass) interfaces = (ScriptingType::InterfaceImplementation*)Allocator::Allocate((interfacesCount + 1) * sizeof(ScriptingType::InterfaceImplementation)); interfacesCount = 0; interfaceIt = nullptr; - while (interfaceKlass = mono_class_get_interfaces(klass, &interfaceIt)) + while ((interfaceKlass = mono_class_get_interfaces(klass, &interfaceIt))) { const ScriptingTypeHandle interfaceTypeHandle = FindType(interfaceKlass); if (!interfaceTypeHandle) diff --git a/Source/Platforms/PS4 b/Source/Platforms/PS4 new file mode 160000 index 000000000..666e9cfca --- /dev/null +++ b/Source/Platforms/PS4 @@ -0,0 +1 @@ +Subproject commit 666e9cfca74bd61230991925cf39ea7c3e9a12c4