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

Integrating latest from github/staging

Browse Source 
Integrating up through commit 5e1bdae
This commit is contained in:
alexpete
2021-03-26 14:31:50 -07:00
parent 9c54341af8
commit 36c4e827bd
764 changed files with 11453 additions and 20251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AssetValidation/Code/Source/AssetValidationSystemComponent.cpp
+3 -3
View File
@@ -452,7 +452,7 @@ namespace AssetValidation
auto settingsRegistry = AZ::SettingsRegistry::Get();
AZ::SettingsRegistryInterface::FixedValueString gameFolder;
auto projectKey = AZ::SettingsRegistryInterface::FixedValueString::format("%s/sys_game_folder", AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey);
auto projectKey = AZ::SettingsRegistryInterface::FixedValueString::format("%s/project_path", AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey);
settingsRegistry->Get(gameFolder, projectKey);
if (gameFolder.empty())
@@ -461,9 +461,9 @@ namespace AssetValidation
return false;
}
AZStd::vector<AssetSeed::GemInfo> gemInfoList;
AZStd::vector<AzFramework::GemInfo> gemInfoList;
if (!AssetSeed::GetGemsInfo(engineRoot, appRoot, gameFolder.c_str(), gemInfoList))
if (!AzFramework::GetGemsInfo(gemInfoList, *settingsRegistry))
{
AZ_Warning("AssetValidation", false, "Unable to get gem information.");
return false;