From b198d653c12841c7084b6d37de88c4c07ee80c88 Mon Sep 17 00:00:00 2001
From: Nicholas Van Sickle <nvsickle@amazon.com>
Date: Wed, 21 Jul 2021 09:53:17 -0700
Subject: [PATCH] Fix FOV getting reset upon entering game mode (#2216)

* Fix FOV getting reset upon entering game mode

Signed-off-by: nvsickle <nvsickle@amazon.com>

* Ensure scenes load with the correct FOV

Signed-off-by: nvsickle <nvsickle@amazon.com>
---
 Code/Editor/EditorViewportWidget.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Code/Editor/EditorViewportWidget.cpp b/Code/Editor/EditorViewportWidget.cpp
index c167fcb460..1f0c87ff6f 100644
--- a/Code/Editor/EditorViewportWidget.cpp
+++ b/Code/Editor/EditorViewportWidget.cpp
@@ -469,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);
     }
 
@@ -2614,6 +2613,8 @@ void EditorViewportWidget::DestroyRenderContext()
 //////////////////////////////////////////////////////////////////////////
 void EditorViewportWidget::SetDefaultCamera()
 {
+    // Ensure the FOV matches our internally stored setting
+    SetFOV(GetFOV());
     if (IsDefaultCamera())
     {
         return;