From ed24d3b33f198ef6f8a0f4c32c2a3496340bf6b6 Mon Sep 17 00:00:00 2001 From: badlogic Date: Mon, 30 Oct 2017 10:11:07 +0100 Subject: [PATCH] [ue4] Updated to 4.18, fixed compilation error in RuntimeMEshComponentDetails.cpp, kept compatibility with older versions. --- CHANGELOG.md | 1 + .../Private/RuntimeMeshComponentDetails.cpp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 084616171..9a06ee0d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -85,6 +85,7 @@ * Added support for two color tinting. All base materials, e.g. SpineUnlitNormalMaterial, now do proper two color tinting. No material parameters have changed. * Updated to Unreal Engine 4.16.1. Note that 4.16 has a regression which will make it impossible to compile plain .c files! * spine-c is now exposed from the plugin shared library on Windows via __declspec. + * Updated to Unreal Engine 4.18 ## C# * **Breaking changes** diff --git a/spine-ue4/Plugins/RuntimeMeshComponentPlugin/Source/RuntimeMeshComponentEditor/Private/RuntimeMeshComponentDetails.cpp b/spine-ue4/Plugins/RuntimeMeshComponentPlugin/Source/RuntimeMeshComponentEditor/Private/RuntimeMeshComponentDetails.cpp index 81c3d5ae1..a2ddff9d4 100644 --- a/spine-ue4/Plugins/RuntimeMeshComponentPlugin/Source/RuntimeMeshComponentEditor/Private/RuntimeMeshComponentDetails.cpp +++ b/spine-ue4/Plugins/RuntimeMeshComponentPlugin/Source/RuntimeMeshComponentEditor/Private/RuntimeMeshComponentDetails.cpp @@ -25,7 +25,11 @@ void FRuntimeMeshComponentDetails::CustomizeDetails( IDetailLayoutBuilder& Detai const FText ConvertToStaticMeshText = LOCTEXT("ConvertToStaticMesh", "Create StaticMesh"); // Cache set of selected things +#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION < 18 SelectedObjectsList = DetailBuilder.GetDetailsView().GetSelectedObjects(); +#else + SelectedObjectsList = DetailBuilder.GetDetailsView()->GetSelectedObjects(); +#endif RuntimeMeshCategory.AddCustomRow(ConvertToStaticMeshText, false) .NameContent()