Integrating github/staging through commit 5f214be

2021-04-13 17:18:57 -07:00
parent 2a9dfb7a1d
commit 8469c9ca0a
904 changed files with 9289 additions and 7157 deletions
@@ -105,8 +105,9 @@ bool CD3DProfilingGPUTimer::Init()
 {
 #ifdef ENABLE_PROFILING_GPU_TIMERS
    return CD3DGPUTimer::Init();
-#endif
+#else
    return false;
+#endif
 }

 CD3DGPUTimer::CD3DGPUTimer()
@@ -264,4 +265,4 @@ bool CD3DGPUTimer::Init()
 #endif

    return m_bInitialized;
-}
+}