diff --git a/Content/EasySynthMoviePipelineConfig.uasset b/Content/EasySynthMoviePipelineConfig.uasset index 3ecfbb2..b1242d7 100644 Binary files a/Content/EasySynthMoviePipelineConfig.uasset and b/Content/EasySynthMoviePipelineConfig.uasset differ diff --git a/Content/M_PlainColor.uasset b/Content/M_PlainColor.uasset index 68ea2a7..b34691b 100644 Binary files a/Content/M_PlainColor.uasset and b/Content/M_PlainColor.uasset differ diff --git a/EasySynth.uplugin b/EasySynth.uplugin index 51f782b..33f5986 100644 --- 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 index 4a34e10..23c5909 100644 --- 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* OutputSettings = GetPipeline()->GetPipelinePrimaryConfig()->FindSetting(); 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 index 2f7f320..45f49c9 100644 --- a/Source/EasySynth/Private/SequenceRenderer.cpp +++ b/Source/EasySynth/Private/SequenceRenderer.cpp @@ -83,8 +83,8 @@ TSharedPtr FRendererTargetOptions::RendererTarget( } USequenceRenderer::USequenceRenderer() : - EasySynthMoviePipelineConfig(DuplicateObject( - LoadObject(nullptr, *FPathUtils::DefaultMoviePipelineConfigPath()), nullptr)), + EasySynthMoviePipelineConfig(DuplicateObject( + LoadObject(nullptr, *FPathUtils::DefaultMoviePipelineConfigPath()), nullptr)), bCurrentlyRendering(false), ErrorMessage("") { diff --git a/Source/EasySynth/Public/SequenceRenderer.h b/Source/EasySynth/Public/SequenceRenderer.h index 57aea1b..a2eab9a 100644 --- 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 index 3fe615f..1c5743b 100644 --- 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 */