fixed 4.27 compilation

rdeioris · Aug 14, 2022 · be8fc2e · be8fc2e
1 parent 52a8f67
commit be8fc2e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/Source/glTFRuntime/Private/glTFRuntimeParserSkeletalMeshes.cpp b/Source/glTFRuntime/Private/glTFRuntimeParserSkeletalMeshes.cpp
@@ -2461,7 +2461,7 @@ USkeletalMesh* FglTFRuntimeParser::LoadSkeletalMeshFromRuntimeLODs(const TArray<
 		return nullptr;
 	}
 
-	if (RuntimeLODs[0].Primitives[0].OverrideBoneMap.IsEmpty())
+	if (RuntimeLODs[0].Primitives[0].OverrideBoneMap.Num() < 1)
 	{
 		AddError("LoadSkeletalMeshFromRuntimeLODs()", "Empty Primitive OverrideBoneMap");
 		return nullptr;
@@ -2496,7 +2496,7 @@ USkeletalMesh* FglTFRuntimeParser::LoadSkeletalMeshFromRuntimeLODs(const TArray<
 
 		for (const FglTFRuntimePrimitive& Primitive : RuntimeLODs[LODIndex].Primitives)
 		{
-			if (Primitive.OverrideBoneMap.IsEmpty())
+			if (Primitive.OverrideBoneMap.Num() < 1)
 			{
 				AddError("LoadSkeletalMeshFromRuntimeLODs()", "Empty Primitive OverrideBoneMap");
 				return nullptr;
@@ -2524,4 +2524,4 @@ USkeletalMesh* FglTFRuntimeParser::LoadSkeletalMeshFromRuntimeLODs(const TArray<
 	}
 
 	return FinalizeSkeletalMeshWithLODs(SkeletalMeshContext);
-}
+}
diff --git a/Source/glTFRuntimeEditor/Private/glTFRuntimeEditor.cpp b/Source/glTFRuntimeEditor/Private/glTFRuntimeEditor.cpp
@@ -53,7 +53,11 @@ void FglTFRuntimeEditorModule::SpawnglTFRuntimeActor()
 void FglTFRuntimeEditorModule::BuildglTFRuntimeMenu(FMenuBuilder& Builder)
 {
 	Builder.BeginSection("glTFRuntime", FText::FromString("glTFRuntime"));
+#if ENGINE_MAJOR_VERSION > 4
 	Builder.AddMenuEntry(LoadGLTFText, LoadGLTFText, FSlateIcon(FAppStyle::GetAppStyleSetName(), "ClassIcon.Default"), FExecuteAction::CreateRaw(this, &FglTFRuntimeEditorModule::SpawnglTFRuntimeActor));
+#else
+	Builder.AddMenuEntry(LoadGLTFText, LoadGLTFText, FSlateIcon(FEditorStyle::GetStyleSetName(), "ClassIcon.Default"), FExecuteAction::CreateRaw(this, &FglTFRuntimeEditorModule::SpawnglTFRuntimeActor));
+#endif
 	Builder.EndSection();
 }
 

diff --git a/Source/glTFRuntimeEditor/glTFRuntimeEditor.Build.cs b/Source/glTFRuntimeEditor/glTFRuntimeEditor.Build.cs
@@ -45,7 +45,8 @@ public glTFRuntimeEditor(ReadOnlyTargetRules Target) : base(Target)
                 "RenderCore",
                 "LevelEditor",
                 "glTFRuntime",
-                "DesktopPlatform"
+                "DesktopPlatform",
+		"EditorStyle"
 				// ... add private dependencies that you statically link with here ...	
 			}
             );