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 4621d32fb..000000000 Binary files a/spine-ue4/Content/Test/Blueprints/TwoColor_Blueprint.uasset and /dev/null differ 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"); } } }