Integrating latest from github/staging

Integrating up through commit 5e1bdae
2021-03-26 14:31:50 -07:00
parent 9c54341af8
commit 36c4e827bd
764 changed files with 11453 additions and 20251 deletions
@@ -293,7 +293,7 @@ typedef uint32 vtx_idx;

 #if defined(ENABLE_PROFILING_CODE)
 #   define USE_DISK_PROFILER
-//#   define ENABLE_LOADING_PROFILER    // Not guaranteed to have enough slots for all the threads in the system
+#   define ENABLE_LOADING_PROFILER  // requires AZ_PROFILE_TELEMETRY to also be defined
 #endif

 #if defined(SOFTCODE_ENABLED)