Various updates to get pak builds working (#4552)

* Various updates to get pak builds working

-Fix basing config file merges off engine root.
-Merge command-line in relelase to make sure they override defaults.
-Fix nullptrs.
-Exclude more paths from being sent to bootstrap setreg.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Reverting a change that caused some test failures.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Change tabs to spaces

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

Code/Framework/AzGameFramework/AzGameFramework/Application/GameApplication.cpp

@@ -96,6 +96,8 @@ namespace AzGameFramework
         AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_CommandLine(registry, m_commandLine, false);
         AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_ProjectUserRegistry(registry, AZ_TRAIT_OS_PLATFORM_CODENAME, specializations, &scratchBuffer);
         AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_CommandLine(registry, m_commandLine, true);
+#else
+        AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_CommandLine(registry, m_commandLine, false);
 #endif
         // Update the Runtime file paths in case the "{BootstrapSettingsRootKey}/assets" key was overriden by a setting registry
         AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddRuntimeFilePaths(registry);

Gems/AtomLyIntegration/CommonFeatures/Code/Source/Grid/GridComponentController.cpp

@@ -175,6 +175,10 @@ namespace AZ
         void GridComponentController::OnBeginPrepareRender()
         {
             auto* auxGeomFP = AZ::RPI::Scene::GetFeatureProcessorForEntity<AZ::RPI::AuxGeomFeatureProcessorInterface>(m_entityId);
+            if (!auxGeomFP)
+            {
+                return;
+            }
             if (auto auxGeom = auxGeomFP->GetDrawQueue())
             {
                 BuildGrid();

Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponentController.cpp

@@ -65,7 +65,7 @@ namespace AZ
             m_featureProcessorInterface = RPI::Scene::GetFeatureProcessorForEntity<SkyBoxFeatureProcessorInterface>(entityId);
 
             // only activate if there is no other skybox activate
-            if (!m_featureProcessorInterface->IsEnabled())
+            if (m_featureProcessorInterface && !m_featureProcessorInterface->IsEnabled())
             {
                 m_featureProcessorInterface->SetSkyboxMode(SkyBoxMode::Cubemap);
                 m_featureProcessorInterface->Enable(true);

Registry/setregbuilder.assetprocessor.setreg

@@ -20,8 +20,13 @@
                 "Excludes":
                 [
                     "/Amazon/AzCore/Runtime",
+                    "/Amazon/AzCore/Bootstrap/engine_path",
                     "/Amazon/AzCore/Bootstrap/project_path",
-                    "/O3DE/Runtime",
+                    "/Amazon/AzCore/Bootstrap/project_cache_path",
+                    "/Amazon/AzCore/Bootstrap/project_user_path",
+                    "/Amazon/AzCore/Bootstrap/project_log_path",
+                    "/Amazon/Project/Settings/Build/project_build_path",
+                    "/O3DE/Runtime"
                 ]
             }
         }