Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -200,7 +200,6 @@ namespace MessagePopup
            }

            // Disable the popup
-            AZ::Entity* instructionsTextElement = nullptr;
            EBUS_EVENT_ID(canvasEntityId, UiCanvasBus, SetEnabled, false);

            gEnv->pLyShine->ReleaseCanvas(canvasEntityId, false);