birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4735 from aws-lumberyard-dev/LYN-7317

Browse Source 
Fix an incorrect path used when fetching product dependencies for level.pak
This commit is contained in:
Nicholas Van Sickle
2021-10-18 10:46:02 -07:00
committed by GitHub
parent 643c5c2f82 29988c4104
commit 7f10b5d1b9
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LmbrCentral/Code/Source/Builders/LevelBuilder/LevelBuilderComponent.cpp
+1 -1
View File
@@ -31,7 +31,7 @@ namespace LevelBuilder
builderDescriptor.m_patterns.emplace_back(
AssetBuilderSDK::AssetBuilderPattern(".*\\/level\\.pak$", AssetBuilderSDK::AssetBuilderPattern::PatternType::Regex));
builderDescriptor.m_busId = azrtti_typeid<LevelBuilderWorker>();
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 =
Gems/LmbrCentral/Code/Source/Builders/LevelBuilder/LevelBuilderWorker.cpp
+2 -4
View File
@@ -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);
}