merge latest

Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-23 16:02:58 -07:00
parent 13188f8958 5a3c289fac
commit 794c22c02e
1126 changed files with 12630 additions and 13375 deletions
@@ -113,7 +113,7 @@ namespace AZ
                return;
            }

-            AZ_PROFILE_FUNCTION(Debug::ProfileCategory::AzRender);
+            AZ_PROFILE_FUNCTION(AzRender);

            AZStd::lock_guard<AZStd::mutex> lock(m_metricsMutex);