Integrating latest 47acbe8

Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorCameraBus.h

@@ -15,6 +15,11 @@
 #include <AzCore/Math/Vector3.h>
 #include <AzCore/Component/Component.h>
 
+namespace AzFramework
+{
+    struct CameraState;
+}
+
 namespace Camera
 {
     /**
@@ -56,6 +61,16 @@ namespace Camera
          * @return True if the camera position was successfully retrieved, false if not.
          */
         virtual bool GetActiveCameraPosition(AZ::Vector3& /*cameraPos*/) { return false; }
+
+        /**
+         * Gets the position of the currently active Editor camera.
+         * The Editor can have multiple viewports displayed, though at most only one is active at any point in time.
+         * (Active is not the same as "has focus" - a different editor pane can have focus, but there's still one
+         * active viewport that's updating every frame, and the others are not).
+         * @param cameraView The current camera view in the one active Editor viewport.
+         * @return True if the camera view was successfully retrieved, false if not.
+         */
+        virtual bool GetActiveCameraState([[maybe_unused]] AzFramework::CameraState& cameraState) { return false; }
     };
 
     using EditorCameraRequestBus = AZ::EBus<EditorCameraRequests>;

Code/Framework/AzToolsFramework/AzToolsFramework/API/ToolsApplicationAPI.h

@@ -42,6 +42,7 @@ class QMenu;
 class QWidget;
 class QApplication;
 class QDockWidget;
+class QMainWindow;
 struct IEditor;
 
 namespace AzToolsFramework
@@ -587,6 +588,13 @@ namespace AzToolsFramework
         */
         virtual const char* GetEngineVersion() const = 0;
 
+        /**
+        * Retrieves if Legacy Slice System is enabled
+        */
+        virtual bool IsLegacySliceSystemEnabled() const = 0;
+
+        virtual bool ShouldAssertForLegacySlicesUsage() const = 0;
+
         /**
         * Creates and adds a new entity to the tools application from components which match at least one of the requiredTags
         * The tag matching occurs on AZ::Edit::SystemComponentTags attribute from the reflected class data in the serialization context
@@ -948,6 +956,9 @@ namespace AzToolsFramework
         /// Notify that the IEditor is ready
         virtual void NotifyIEditorAvailable(IEditor* /*editor*/) {}
 
+        /// Notify that the MainWindow has been fully initialized
+        virtual void NotifyMainWindowInitialized(QMainWindow* /*mainWindow*/) {}
+
         /// Signal that an asset should be highlighted / selected
         virtual void SelectAsset(const QString& /* assetPath */) {}
     };