Integrating latest 47acbe8

Code/Sandbox/Editor/ViewManager.cpp

@@ -31,8 +31,19 @@
 #include "2DViewport.h"
 #include "TopRendererWnd.h"
 #include "RenderViewport.h"
+#include "EditorViewportWidget.h"
 #include "CryEditDoc.h"
 
+#include <AzFramework/API/AtomActiveInterface.h>
+#include <AzCore/Console/IConsole.h>
+
+AZ_CVAR(bool, ed_useAtomNativeViewport, false, nullptr, AZ::ConsoleFunctorFlags::Null, "Use the new Atom-native Editor viewport (experimental, not yet stable");
+
+bool CViewManager::IsMultiViewportEnabled()
+{
+    // Enable multi-viewport for legacy renderer, or if we're using the new fully Atom-native viewport
+    return !AZ::Interface<AzFramework::AtomActiveInterface>::Get() || ed_useAtomNativeViewport;
+}
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
@@ -70,7 +81,14 @@ CViewManager::CViewManager()
     RegisterQtViewPane<C2DViewport_YZ>(GetIEditor(), "Left", LyViewPane::CategoryViewport, viewportOptions);
 
     viewportOptions.viewportType = ET_ViewportCamera;
-    RegisterQtViewPaneWithName<CRenderViewport>(GetIEditor(), "Perspective", LyViewPane::CategoryViewport, viewportOptions);
+    if (ed_useAtomNativeViewport && AZ::Interface<AzFramework::AtomActiveInterface>::Get())
+    {
+        RegisterQtViewPaneWithName<EditorViewportWidget>(GetIEditor(), "Perspective", LyViewPane::CategoryViewport, viewportOptions);
+    }
+    else
+    {
+        RegisterQtViewPaneWithName<CRenderViewport>(GetIEditor(), "Perspective", LyViewPane::CategoryViewport, viewportOptions);
+    }
 
     viewportOptions.viewportType = ET_ViewportMap;
     RegisterQtViewPane<QTopRendererWnd>(GetIEditor(), "Map", LyViewPane::CategoryViewport, viewportOptions);