Merge branch 'development' into cmake/SPEC-2513_w4244

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/CryEditDoc.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
#	Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.cpp
#	Gems/PhysXDebug/Code/Source/SystemComponent.cpp
This commit is contained in:
Esteban Papp
2021-08-19 08:53:41 -07:00
370 changed files with 3276 additions and 4248 deletions
+1 -1
View File
@@ -701,7 +701,7 @@ void CSystem::SleepIfNeeded()
int sleepMS = (int)(1000.0f * sleepTime + 0.5f);
if (sleepMS > 0)
{
AZ_PROFILE_FUNCTION_IDLE(AZ::Debug::ProfileCategory::System);
AZ_PROFILE_FUNCTION(System);
Sleep(sleepMS);
}