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>
2021-10-13 15:22:25 -05:00
parent e7d7720d02
commit 29b62c7b84
4 changed files with 13 additions and 2 deletions
@@ -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();