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
Code/Tools/SerializeContextTools/Utilities.cpp
+5 -5
View File
@@ -36,13 +36,13 @@ namespace AZ::SerializeContextTools
AZ::IO::Path sourceGameFolder;
if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr)
{
settingsRegistry->Get(sourceGameFolder.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_SourceGameFolder);
settingsRegistry->Get(sourceGameFolder.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_ProjectPath);
}
AZ::IO::Path outputPath;
if (application.GetCommandLine()->HasSwitch("output"))
if (application.GetAzCommandLine()->HasSwitch("output"))
{
outputPath.Native() = application.GetCommandLine()->GetSwitchValue("output", 0);
outputPath.Native() = application.GetAzCommandLine()->GetSwitchValue("output", 0);
if (outputPath.IsRelative())
{
outputPath = sourceGameFolder / outputPath;
@@ -59,7 +59,7 @@ namespace AZ::SerializeContextTools
{
AZStd::vector<AZStd::string> result;
const AZ::CommandLine* commandLine = application.GetCommandLine();
const AZ::CommandLine* commandLine = application.GetAzCommandLine();
if (!commandLine)
{
AZ_Error("SerializeContextTools", false, "Command line not available.");
@@ -76,7 +76,7 @@ namespace AZ::SerializeContextTools
AZ::IO::Path sourceGameFolder;
if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr)
{
settingsRegistry->Get(sourceGameFolder.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_SourceGameFolder);
settingsRegistry->Get(sourceGameFolder.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_ProjectPath);
}
AZStd::vector<AZStd::string_view> fileList;