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
@@ -1589,7 +1589,7 @@ void CShaderMan::mfInit (void)
 #else
        m_ShadersCache = CONCAT_PATHS(g_shaderCache, "D3D11");
 #endif
-        m_szCachePath = "@cache@/";
+        m_szCachePath = "@usercache@/";
        
        if (CRenderer::CV_r_shadersImport == 3)
        {