Integrating latest 47acbe8

Code/Sandbox/Editor/ViewPane.cpp

@@ -46,6 +46,7 @@
 #include "UserMessageDefines.h"
 #include "MainWindow.h"
 #include "QtViewPaneManager.h"
+#include "EditorViewportWidget.h"
 
 //////////////////////////////////////////////////////////////////////////
 // ViewportTitleExpanderWatcher
@@ -313,6 +314,10 @@ void CLayoutViewPane::AttachViewport(QWidget* pViewport)
             {
                 renderViewport->ConnectViewportInteractionRequestBus();
             }
+            if (EditorViewportWidget* renderViewport = viewport_cast<EditorViewportWidget*>(vp))
+            {
+                renderViewport->ConnectViewportInteractionRequestBus();
+            }
         }
 
         m_viewport->setVisible(true);
@@ -360,6 +365,10 @@ void CLayoutViewPane::DisconnectRenderViewportInteractionRequestBus()
         {
             renderViewport->DisconnectViewportInteractionRequestBus();
         }
+        if (EditorViewportWidget* renderViewport = viewport_cast<EditorViewportWidget*>(vp))
+        {
+            renderViewport->DisconnectViewportInteractionRequestBus();
+        }
     }
 }
 
@@ -469,6 +478,16 @@ void CLayoutViewPane::SetViewportFOV(float fov)
     {
         pRenderViewport->SetFOV(DEG2RAD(fov));
 
+        // if viewport camera is active, make selected fov new default
+        if (pRenderViewport->GetViewManager()->GetCameraObjectId() == GUID_NULL)
+        {
+            gSettings.viewports.fDefaultFov = DEG2RAD(fov);
+        }
+    }
+    if (EditorViewportWidget* pRenderViewport = qobject_cast<EditorViewportWidget*>(m_viewport))
+    {
+        pRenderViewport->SetFOV(DEG2RAD(fov));
+
         // if viewport camera is active, make selected fov new default
         if (pRenderViewport->GetViewManager()->GetCameraObjectId() == GUID_NULL)
         {