Merge branch 'stabilization/2106' into hultonha/gitflow_210707_o3de

Signed-off-by: hultonha <hultonha@amazon.co.uk>
This commit is contained in:
hultonha
2021-07-07 16:25:06 +01:00
8 changed files with 40 additions and 161 deletions
@@ -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()