Integrating up through commit 90f050496

Code/Tools/RC/ResourceCompiler/ResourceCompiler.cpp

@@ -48,6 +48,7 @@
 #include "CryLibrary.h"
 
 #include <AzCore/Module/Environment.h>
+#include <AzFramework/API/ApplicationAPI.h>
 #include <AzFramework/StringFunc/StringFunc.h>
 #include <AzFramework/CommandLine/CommandLine.h>
 
@@ -2407,23 +2408,30 @@ void ResourceCompiler::ScanForAssetReferences(std::vector<string>& outReferences
         }
     }
 
-    std::vector<string> levelPaks;
-    FileUtil::ScanDirectory(scanRoot, "level.pak", levelPaks, true, string());
-    for (size_t i = 0; i < levelPaks.size(); ++i)
+    bool usePrefabSystemForLevels = false;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(
+        usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+
+    if (!usePrefabSystemForLevels)
     {
-        const string path = PathHelpers::GetDirectory(levelPaks[i].c_str()) + "\\resourcelist.txt";
-        if (reader.LoadFromPak(GetPakSystem(), path, lines))
+        std::vector<string> levelPaks;
+        FileUtil::ScanDirectory(scanRoot, "level.pak", levelPaks, true, string());
+        for (size_t i = 0; i < levelPaks.size(); ++i)
         {
-            for (size_t j = 0; j < lines.size(); ++j)
+            const string path = PathHelpers::GetDirectory(levelPaks[i].c_str()) + "\\resourcelist.txt";
+            if (reader.LoadFromPak(GetPakSystem(), path, lines))
             {
-                const char* const line = lines[j];
-                if (references.find(line) == references.end())
+                for (size_t j = 0; j < lines.size(); ++j)
                 {
-                    strings.push_back(line);
-                    references.insert(strings.back().c_str());
+                    const char* const line = lines[j];
+                    if (references.find(line) == references.end())
+                    {
+                        strings.push_back(line);
+                        references.insert(strings.back().c_str());
+                    }
                 }
+                ++numSources;
             }
-            ++numSources;
         }
     }
 

Code/Tools/RC/ResourceCompiler/main.cpp

@@ -558,10 +558,14 @@ int rcmain(int argc, char** argv, [[maybe_unused]] char** envp)
         RCLog("Initializing System");
 
         {
-            // Create a local SettingsRegistry to read the bootstrap.cfg settings if the appRoot hasn't been overriden
+            // Create a local SettingsRegistry to read the bootstrap.cfg settings if the engine root hasn't been overridden
             // on the command line
+            AZ::CommandLine commandLine;
+            commandLine.Parse(argc, argv);
             AZ::SettingsRegistryImpl settingsRegistry;
             AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_Bootstrap(settingsRegistry);
+            AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_O3deUserRegistry(settingsRegistry, AZ_TRAIT_OS_PLATFORM_CODENAME, {});
+            AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_CommandLine(settingsRegistry, commandLine, false);
 
             string projectPath = config.GetAsString("gameroot", "", "");
             if (!projectPath.empty())