From 90daa74e5297a19ef157f10c8fa1e60a7a9083b0 Mon Sep 17 00:00:00 2001 From: srikappa-amzn Date: Fri, 15 Oct 2021 12:37:29 -0700 Subject: [PATCH 1/2] Fix an incorrect path used when fetching product dependencies for level.pak Signed-off-by: srikappa-amzn --- .../Source/Builders/LevelBuilder/LevelBuilderWorker.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Gems/LmbrCentral/Code/Source/Builders/LevelBuilder/LevelBuilderWorker.cpp b/Gems/LmbrCentral/Code/Source/Builders/LevelBuilder/LevelBuilderWorker.cpp index 00e9eaf0fe..8a8f7348ae 100644 --- a/Gems/LmbrCentral/Code/Source/Builders/LevelBuilder/LevelBuilderWorker.cpp +++ b/Gems/LmbrCentral/Code/Source/Builders/LevelBuilder/LevelBuilderWorker.cpp @@ -162,10 +162,8 @@ namespace LevelBuilder extractResult.wait(); - auto levelsubfolder = AZ::IO::Path(tempDirectory) / "level"; - - PopulateLevelSliceDependencies(levelsubfolder.Native(), productDependencies, productPathDependencies); - PopulateMissionDependencies(levelPakFile, levelsubfolder.Native(), productPathDependencies); + PopulateLevelSliceDependencies(tempDirectory, productDependencies, productPathDependencies); + PopulateMissionDependencies(levelPakFile, tempDirectory, productPathDependencies); PopulateLevelAudioControlDependencies(levelPakFile, productPathDependencies); } From 29988c4104f2b477660f02b4fca36709cbe3308f Mon Sep 17 00:00:00 2001 From: srikappa-amzn Date: Mon, 18 Oct 2021 08:49:06 -0700 Subject: [PATCH 2/2] Bump the version of LevelBuilderComponent after fixing the incorrect level pak path Signed-off-by: srikappa-amzn --- .../Code/Source/Builders/LevelBuilder/LevelBuilderComponent.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gems/LmbrCentral/Code/Source/Builders/LevelBuilder/LevelBuilderComponent.cpp b/Gems/LmbrCentral/Code/Source/Builders/LevelBuilder/LevelBuilderComponent.cpp index 9a6dd110d9..7e6fc54830 100644 --- a/Gems/LmbrCentral/Code/Source/Builders/LevelBuilder/LevelBuilderComponent.cpp +++ b/Gems/LmbrCentral/Code/Source/Builders/LevelBuilder/LevelBuilderComponent.cpp @@ -31,7 +31,7 @@ namespace LevelBuilder builderDescriptor.m_patterns.emplace_back( AssetBuilderSDK::AssetBuilderPattern(".*\\/level\\.pak$", AssetBuilderSDK::AssetBuilderPattern::PatternType::Regex)); builderDescriptor.m_busId = azrtti_typeid(); - builderDescriptor.m_version = 8; + builderDescriptor.m_version = 9; builderDescriptor.m_createJobFunction = AZStd::bind(&LevelBuilderWorker::CreateJobs, &m_levelBuilder, AZStd::placeholders::_1, AZStd::placeholders::_2); builderDescriptor.m_processJobFunction =