From 8044760613db5be48e889aa7f45c4b2effab6dab Mon Sep 17 00:00:00 2001
From: Vicky <55564570+VickyAtAZ@users.noreply.github.com>
Date: Mon, 10 May 2021 13:33:51 -0700
Subject: [PATCH] ATOM-15446 ImGui assert with Editor debug build (#622)

Disable the assert as short term solution. A proper fix will be addressed in ATOM-15495
---
 Gems/ImGui/External/ImGui/v1.82/imgui/imgui.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Gems/ImGui/External/ImGui/v1.82/imgui/imgui.cpp b/Gems/ImGui/External/ImGui/v1.82/imgui/imgui.cpp
index 2555d1a6af..c2db0da54a 100644
--- a/Gems/ImGui/External/ImGui/v1.82/imgui/imgui.cpp
+++ b/Gems/ImGui/External/ImGui/v1.82/imgui/imgui.cpp
@@ -7118,7 +7118,9 @@ static void ImGui::ErrorCheckEndFrameSanityChecks()
     // We silently accommodate for this case by ignoring/ the case where all io.KeyXXX modifiers were released (aka key_mod_flags == 0),
     // while still correctly asserting on mid-frame key press events.
     const ImGuiKeyModFlags key_mod_flags = GetMergedKeyModFlags();
-    IM_ASSERT((key_mod_flags == 0 || g.IO.KeyMods == key_mod_flags) && "Mismatching io.KeyCtrl/io.KeyShift/io.KeyAlt/io.KeySuper vs io.KeyMods");
+
+    // [GFX TODO] Commented this line until Atom ImGuiPass is refactored (ATOM-15495).
+    // IM_ASSERT((key_mod_flags == 0 || g.IO.KeyMods == key_mod_flags) && "Mismatching io.KeyCtrl/io.KeyShift/io.KeyAlt/io.KeySuper vs io.KeyMods");
     IM_UNUSED(key_mod_flags);
 
     // Recover from errors