Merge branch 'development' of https://github.com/o3de/o3de into GroupToggleSwitch

Code/Editor/TrackView/SequenceBatchRenderDialog.cpp

@@ -13,6 +13,7 @@
 
 #include "SequenceBatchRenderDialog.h"
 
+#include <AzCore/Component/ComponentApplication.h>
 #include <AzFramework/Windowing/WindowBus.h>
 
 // Qt
@@ -1215,6 +1216,18 @@ void CSequenceBatchRenderDialog::OnKickIdleTimout()
         // All done with our custom OnKickIdle, restore editor idle.
         SetEnableEditorIdleProcessing(true);
     }
+
+    //When we disable the editor idle processing. system tick is no longer invoked.
+    //so we call it here to ensure rendering + other systems are updated.
+    if (!m_editorIdleProcessingEnabled)
+    {
+        AZ::ComponentApplication* componentApplication = nullptr;
+        AZ::ComponentApplicationBus::BroadcastResult(componentApplication, &AZ::ComponentApplicationRequests::GetApplication);
+        if (componentApplication)
+        {
+            componentApplication->TickSystem();
+        }
+    }
 }
 
 void CSequenceBatchRenderDialog::OnKickIdle()

Code/Tools/SceneAPI/SceneData/Groups/MeshGroup.h

@@ -28,27 +28,27 @@ namespace AZ
         }
         namespace SceneData
         {
-            class SCENE_DATA_CLASS MeshGroup
+            class MeshGroup
                 : public DataTypes::IMeshGroup
             {
             public:
                 AZ_RTTI(MeshGroup, "{07B356B7-3635-40B5-878A-FAC4EFD5AD86}", DataTypes::IMeshGroup);
                 AZ_CLASS_ALLOCATOR(MeshGroup, SystemAllocator, 0)
 
-                SCENE_DATA_API MeshGroup();
-                SCENE_DATA_API ~MeshGroup() override = default;
+                MeshGroup();
+                ~MeshGroup() override = default;
 
-                SCENE_DATA_API const AZStd::string& GetName() const override;
-                SCENE_DATA_API void SetName(const AZStd::string& name);
-                SCENE_DATA_API void SetName(AZStd::string&& name) override;
-                SCENE_DATA_API const Uuid& GetId() const override;
-                SCENE_DATA_API void OverrideId(const Uuid& id) override;
+                const AZStd::string& GetName() const override;
+                void SetName(const AZStd::string& name);
+                void SetName(AZStd::string&& name) override;
+                const Uuid& GetId() const override;
+                void OverrideId(const Uuid& id) override;
 
-                SCENE_DATA_API Containers::RuleContainer& GetRuleContainer() override;
-                SCENE_DATA_API const Containers::RuleContainer& GetRuleContainerConst() const override;
+                Containers::RuleContainer& GetRuleContainer() override;
+                const Containers::RuleContainer& GetRuleContainerConst() const override;
 
-                SCENE_DATA_API DataTypes::ISceneNodeSelectionList& GetSceneNodeSelectionList() override;
-                SCENE_DATA_API const DataTypes::ISceneNodeSelectionList& GetSceneNodeSelectionList() const override;
+                DataTypes::ISceneNodeSelectionList& GetSceneNodeSelectionList() override;
+                const DataTypes::ISceneNodeSelectionList& GetSceneNodeSelectionList() const override;
 
                 static void Reflect(AZ::ReflectContext* context);
                 static bool VersionConverter(SerializeContext& context, SerializeContext::DataElementNode& classElement);