From b0c88b23220ece5a2810e5c77d3e18d087bad069 Mon Sep 17 00:00:00 2001 From: badlogic Date: Fri, 13 Jul 2018 14:27:34 +0200 Subject: [PATCH] Fixed up build for UE 4.20 preview 5. Packaging compiler flags are more strict than editor compiler flags... --- .../Test/Blueprints/TwoColor_Blueprint.uasset | Bin 57732 -> 0 bytes .../Source/SpinePlugin/Private/SSpineWidget.cpp | 4 ++-- .../SpinePlugin/Private/SpineAtlasAsset.cpp | 2 +- .../Private/SpineSkeletonRendererComponent.cpp | 2 +- .../Source/SpinePlugin/SpinePlugin.Build.cs | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 spine-ue4/Content/Test/Blueprints/TwoColor_Blueprint.uasset diff --git a/spine-ue4/Content/Test/Blueprints/TwoColor_Blueprint.uasset b/spine-ue4/Content/Test/Blueprints/TwoColor_Blueprint.uasset deleted file mode 100644 index 4621d32fb9d7a3d7e24e5132437e5b6ca524d952..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 57732 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 Mn{_{a)-jv^AMbbfy#N3J diff --git a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SSpineWidget.cpp b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SSpineWidget.cpp index f96ce1097..e395ce152 100644 --- a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SSpineWidget.cpp +++ b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SSpineWidget.cpp @@ -206,7 +206,7 @@ void SSpineWidget::Flush(int32 LayerId, FSlateWindowElementList& OutDrawElements float width = AllottedGeometry.GetAbsoluteSize().X; float height = AllottedGeometry.GetAbsoluteSize().Y; - for (size_t i = 0; i < Vertices.Num(); i++) { + for (size_t i = 0; i < (size_t)Vertices.Num(); i++) { setVertex(&vertexData[i], Vertices[i].X, Vertices[i].Y, Uvs[i].X, Uvs[i].Y, Colors[i], offset); } @@ -245,7 +245,7 @@ void SSpineWidget::UpdateMesh(int32 LayerId, FSlateWindowElementList& OutDrawEle float depthOffset = 0; unsigned short quadIndices[] = { 0, 1, 2, 0, 2, 3 }; - for (int i = 0; i < Skeleton->getSlots().size(); ++i) { + for (int i = 0; i < (int)Skeleton->getSlots().size(); ++i) { Vector &attachmentVertices = worldVertices; unsigned short* attachmentIndices = nullptr; int numVertices; diff --git a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineAtlasAsset.cpp b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineAtlasAsset.cpp index b52562a32..d94b59a8c 100644 --- a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineAtlasAsset.cpp +++ b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineAtlasAsset.cpp @@ -107,7 +107,7 @@ Atlas* USpineAtlasAsset::GetAtlas (bool ForceReload) { Vector &pages = atlas->getPages(); for (size_t i = 0, n = pages.size(), j = 0; i < n; i++) { AtlasPage* page = pages[i]; - if (atlasPages.Num() > 0 && atlasPages.Num() > i) + if (atlasPages.Num() > 0 && atlasPages.Num() > (int32)i) page->setRendererObject(atlasPages[j++]); } } diff --git a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonRendererComponent.cpp b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonRendererComponent.cpp index 6ea52d9a2..dce632bb8 100644 --- a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonRendererComponent.cpp +++ b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Private/SpineSkeletonRendererComponent.cpp @@ -195,7 +195,7 @@ void USpineSkeletonRendererComponent::UpdateMesh(Skeleton* Skeleton) { float depthOffset = 0; unsigned short quadIndices[] = { 0, 1, 2, 0, 2, 3 }; - for (int i = 0; i < Skeleton->getSlots().size(); ++i) { + for (size_t i = 0; i < Skeleton->getSlots().size(); ++i) { Vector &attachmentVertices = worldVertices; unsigned short* attachmentIndices = nullptr; int numVertices; diff --git a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/SpinePlugin.Build.cs b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/SpinePlugin.Build.cs index 3ccb0fb47..60aabb866 100644 --- a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/SpinePlugin.Build.cs +++ b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/SpinePlugin.Build.cs @@ -9,9 +9,9 @@ namespace UnrealBuildTool.Rules PublicIncludePaths.AddRange(new string[] { "SpinePlugin/Public", "SpinePlugin/Public/spine-cpp/include" }); PrivateIncludePaths.AddRange(new string[] { "SpinePlugin/Private", "SpinePlugin/Public/spine-cpp/include" }); PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "RHI", "RenderCore", "ShaderCore", "ProceduralMeshComponent", "UMG", "Slate", "SlateCore" }); - Definitions.Add("SPINE_UE4"); + // Definitions.Add("SPINE_UE4"); // In Unreal 4.20+, comment the above line, uncomment the below line - // PublicDefinitions.Add("SPINE_UE4"); + PublicDefinitions.Add("SPINE_UE4"); } } }