Merge pull request #69 from ydrive/ue5.2

Upgrade to UE 5.2
ydrive · Dec 11, 2023 · 2b59955 · 2b59955
2 parents 5a2ef87 + 5adc0dd
commit 2b59955
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/Content/EasySynthMoviePipelineConfig.uasset b/Content/EasySynthMoviePipelineConfig.uasset
diff --git a/Content/M_PlainColor.uasset b/Content/M_PlainColor.uasset
diff --git a/EasySynth.uplugin b/EasySynth.uplugin
@@ -1,8 +1,8 @@
 {
 	"FileVersion": 3,
-	"Version": 4,
-	"VersionName": "3.0.0",
-	"EngineVersion" : "5.1.0",
+	"Version": 5,
+	"VersionName": "4.0.0",
+	"EngineVersion" : "5.2",
 	"FriendlyName": "EasySynth",
 	"Description": "An Unreal Engine plugin for easy creation of image datasets",
 	"Category": "Other",

diff --git a/Source/EasySynth/Private/EXROutput/MoviePipelineEXROutputLocal.cpp b/Source/EasySynth/Private/EXROutput/MoviePipelineEXROutputLocal.cpp
@@ -14,7 +14,7 @@
 #include "ImageWriteQueue.h"
 #include "MoviePipeline.h"
 #include "MoviePipelineImageQuantization.h"
-#include "MoviePipelineMasterConfig.h"
+#include "MoviePipelinePrimaryConfig.h"
 #include "IOpenExrRTTIModule.h"
 #include "Modules/ModuleManager.h"
 #include "MoviePipelineUtils.h"
@@ -396,7 +396,7 @@ void UMoviePipelineImageSequenceOutput_EXRLocal::OnReceiveImageDataImpl(FMoviePi
 	FModuleManager::Get().LoadModule(RTTIExtensionModuleName);
 
 
-	UMoviePipelineOutputSetting* OutputSettings = GetPipeline()->GetPipelineMasterConfig()->FindSetting<UMoviePipelineOutputSetting>();
+	UMoviePipelineOutputSetting* OutputSettings = GetPipeline()->GetPipelinePrimaryConfig()->FindSetting<UMoviePipelineOutputSetting>();
 	check(OutputSettings);
 
 	// EXR only supports one resolution per file, but in certain scenarios we can get layers with different resolutions. To solve this, we're

diff --git a/Source/EasySynth/Private/SequenceRenderer.cpp b/Source/EasySynth/Private/SequenceRenderer.cpp
@@ -83,8 +83,8 @@ TSharedPtr<FRendererTarget> FRendererTargetOptions::RendererTarget(
 }
 
 USequenceRenderer::USequenceRenderer() :
-	EasySynthMoviePipelineConfig(DuplicateObject<UMoviePipelineMasterConfig>(
-		LoadObject<UMoviePipelineMasterConfig>(nullptr, *FPathUtils::DefaultMoviePipelineConfigPath()), nullptr)),
+	EasySynthMoviePipelineConfig(DuplicateObject<UMoviePipelinePrimaryConfig>(
+		LoadObject<UMoviePipelinePrimaryConfig>(nullptr, *FPathUtils::DefaultMoviePipelineConfigPath()), nullptr)),
 	bCurrentlyRendering(false),
 	ErrorMessage("")
 {

diff --git a/Source/EasySynth/Public/SequenceRenderer.h b/Source/EasySynth/Public/SequenceRenderer.h
@@ -16,7 +16,7 @@
 
 class ULevelSequence;
 class UMoviePipelineExecutorBase;
-class UMoviePipelineMasterConfig;
+class UMoviePipelinePrimaryConfig;
 class UMoviePipelineQueueSubsystem;
 
 
@@ -160,7 +160,7 @@ class USequenceRenderer : public UObject
 
 	/** Default movie pipeline config file provided with the plugin content */
 	UPROPERTY()
-	UMoviePipelineMasterConfig* EasySynthMoviePipelineConfig;
+	UMoviePipelinePrimaryConfig* EasySynthMoviePipelineConfig;
 
 	/** Points to the user-created level sequence */
 	UPROPERTY()

diff --git a/Source/EasySynth/Public/TextureStyles/TextureMappingAsset.h b/Source/EasySynth/Public/TextureStyles/TextureMappingAsset.h
@@ -20,7 +20,7 @@ struct FSemanticClass
 	FString Name;
 
 	/** The semantic class color */
-	UPROPERTY(EditAnywhere, Category = "Semantic Class Properties")
+	UPROPERTY(EditAnywhere, Category = "Semantic Class Properties", meta = (IgnoreForMemberInitializationTest))
 	FColor Color;
 
 	/** Reference to the plain color material instance */