izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Versioning guid collision fixes

Browse Source 
#jira UE-217835
#rb phil.popp
#rnx
[FYI] sondra.moyls
#tests local edits, audioQA automated tests, project fast cook

[CL 34376054 by rob gay in ue5-main branch]
This commit is contained in:
rob gay
2024-06-14 13:05:35 -04:00
parent bc36ef6880
commit 81433d4d49
11 changed files with 149 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Engine/Plugins/Runtime/Metasound/Source/MetasoundEngine/Private/MetasoundEngineAsset.h
+23 -7
View File
@@ -6,6 +6,7 @@
#include "MetasoundAssetManager.h"
#include "MetasoundDocumentBuilderRegistry.h"
#include "MetasoundFrontendDocumentIdGenerator.h"
#include "MetasoundFrontendGraph.h"
#include "MetasoundFrontendRegistryKey.h"
#include "MetasoundUObjectRegistry.h"
#include "Misc/App.h"
@@ -14,9 +15,9 @@
#if WITH_EDITORONLY_DATA
#include "Algo/Transform.h"
#include "MetasoundFrontendRegistryContainer.h"
#include "UObject/GarbageCollection.h"
#include "UObject/StrongObjectPtrTemplates.h"
#include "UObject/ObjectMacros.h"
#include "UObject/GarbageCollection.h"
#endif // WITH_EDITORONLY_DATA
@@ -28,6 +29,11 @@ namespace Metasound::Engine
*/
struct FAssetHelper
{
static bool IsDeterministic(bool bIsContextCooking)
{
return bIsContextCooking || IsRunningCookCommandlet();
}
#if WITH_EDITOR
static void PreDuplicate(TScriptInterface<IMetaSoundDocumentInterface> MetaSound, FObjectDuplicationParameters& DupParams)
{
@@ -138,11 +144,13 @@ namespace Metasound::Engine
AssetManager->WaitUntilAsyncLoadReferencedAssetsComplete(InMetaSound);
}
if (InSaveContext.IsCooking() || IsRunningCommandlet())
const bool bIsCooking = InSaveContext.IsCooking();
const bool bCanEverExecute = FFrontendGraphBuilder::CanEverExecute(bIsCooking);
if (!bCanEverExecute)
{
constexpr bool bIsDeterministic = true;
FDocumentIDGenerator::FScopeDeterminism DeterminismScope = FDocumentIDGenerator::FScopeDeterminism(bIsDeterministic);
InMetaSound.CookMetaSound();
const bool bIsDeterministic = IsDeterministic(bIsCooking);
FDocumentIDGenerator::FScopeDeterminism DeterminismScope(bIsDeterministic);
InMetaSound.PreSaveDocument();
}
else if (FApp::CanEverRenderAudio())
{
@@ -165,6 +173,8 @@ namespace Metasound::Engine
static void SerializeToArchive(TMetaSoundObject& InMetaSound, FArchive& InArchive)
{
#if WITH_EDITORONLY_DATA
using namespace Frontend;
bool bVersionedAsset = false;
if (InArchive.IsLoading())
@@ -175,8 +185,14 @@ namespace Metasound::Engine
Builder.Reset(&FDocumentBuilderRegistry::GetChecked().FindOrBeginBuilding(InMetaSound));
}
check(Builder.IsValid());
bVersionedAsset = InMetaSound.VersionAsset(Builder->GetBuilder());
{
const bool bIsCooking = InArchive.IsCooking();
const bool bIsDeterministic = IsDeterministic(bIsCooking);
FDocumentIDGenerator::FScopeDeterminism DeterminismScope(bIsDeterministic);
check(Builder.IsValid());
bVersionedAsset = InMetaSound.VersionAsset(Builder->GetBuilder());
}
Builder->ClearInternalFlags(EInternalObjectFlags::Async);
}