From 4de1d90994a01886ae6bb9df4a09bf73a8545317 Mon Sep 17 00:00:00 2001
From: mnaumov <mnaumov@amazon.com>
Date: Mon, 21 Jun 2021 16:52:05 -0700
Subject: [PATCH 1/2] [ATOM-15292] Camera no longer resets when typing
 something

---
 .../MaterialEditorViewportInputController.cpp          | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.cpp
index 420e2732d0..9ee8fec83f 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.cpp
@@ -10,6 +10,9 @@
 *
 */
 
+#include "Viewport/MaterialViewportWidget.h"
+
+#include <QApplication>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/Math/Matrix4x4.h>
@@ -223,7 +226,12 @@ namespace MaterialEditor
             }
             else if (inputChannelId == InputDeviceKeyboard::Key::AlphanumericZ && (m_keys & Ctrl) == None)
             {
-                Reset();
+                // only reset camera if no other widget besides viewport is in focus
+                const auto focus = QApplication::focusWidget();
+                if (!focus || focus->objectName() == "Viewport")
+                {
+                    Reset();
+                }
             }
             break;
         case InputChannel::State::Updated:

From 5a276b11b0e89df5fce9e667b67776c3a55c4117 Mon Sep 17 00:00:00 2001
From: mnaumov <mnaumov@amazon.com>
Date: Mon, 21 Jun 2021 16:56:06 -0700
Subject: [PATCH 2/2] Fixing includes

---
 .../InputController/MaterialEditorViewportInputController.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.cpp
index 9ee8fec83f..f2dc1fc3e4 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.cpp
@@ -10,9 +10,9 @@
 *
 */
 
-#include "Viewport/MaterialViewportWidget.h"
-
 #include <QApplication>
+#include <QWidget>
+
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/Math/Matrix4x4.h>