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
@@ -56,10 +56,6 @@ CStatObj::CStatObj()
    m_fLodDistance = 0.0f;

    Init();
-
-#ifdef TRACE_CGF_LEAKS
-    m_sLoadingCallstack = GetSystem()->GetLoadingProfilerCallstack();
-#endif
 }

 //////////////////////////////////////////////////////////////////////////