Merge branch 'development' into LYN-3705-2

Code/Editor/EditorViewportWidget.cpp

@@ -403,6 +403,19 @@ bool EditorViewportWidget::event(QEvent* event)
         m_keyDown.clear();
         break;
 
+    case QEvent::ShortcutOverride:
+    {
+        // Ensure we exit game mode on escape, even if something else would eat our escape key event.
+        if (static_cast<QKeyEvent*>(event)->key() == Qt::Key_Escape && GetIEditor()->IsInGameMode())
+        {
+            GetIEditor()->SetInGameMode(false);
+            event->accept();
+            return true;
+        }
+        break;
+    }
+
+
     case QEvent::Shortcut:
         // a shortcut should immediately clear us, otherwise the release event never gets sent
         m_keyDown.clear();
@@ -456,7 +469,6 @@ void EditorViewportWidget::Update()
         auto m = AZMatrix3x4ToLYMatrix3x4(matrix);
 
         SetViewTM(m);
-        SetFOV(cameraState.m_fovOrZoom);
         m_Camera.SetZRange(cameraState.m_nearClip, cameraState.m_farClip);
     }
 
@@ -2601,6 +2613,8 @@ void EditorViewportWidget::DestroyRenderContext()
 //////////////////////////////////////////////////////////////////////////
 void EditorViewportWidget::SetDefaultCamera()
 {
+    // Ensure the FOV matches our internally stored setting
+    SetFOV(GetFOV());
     if (IsDefaultCamera())
     {
         return;

Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h

@@ -296,8 +296,8 @@ private:
     AZStd::unordered_set<AZ::EntityId> m_unsavedEntities;
 
     const AZStd::string m_defaultComponentIconLocation = "Icons/Components/Component_Placeholder.svg";
-    const AZStd::string m_defaultComponentViewportIconLocation = "Icons/Components/Viewport/Component_Placeholder.png";
-    const AZStd::string m_defaultEntityIconLocation = "Icons/Components/Viewport/Transform.png";
+    const AZStd::string m_defaultComponentViewportIconLocation = "Icons/Components/Viewport/Component_Placeholder.svg";
+    const AZStd::string m_defaultEntityIconLocation = "Icons/Components/Viewport/Transform.svg";
 
     bool m_debugDisplayBusImplementationActive = false;
 

Code/Editor/ShortcutDispatcher.cpp

@@ -346,7 +346,6 @@ bool ShortcutDispatcher::eventFilter(QObject* obj, QEvent* ev)
 
     case QEvent::Shortcut:
         return shortcutFilter(obj, static_cast<QShortcutEvent*>(ev));
-        break;
 
     case QEvent::MouseButtonPress:
         if (!s_lastFocus || !IsAContainerForB(qobject_cast<QWidget*>(obj), s_lastFocus))