xrRender/ResourceManager.cpp: Force built-in blenders when FFP is ena…

…bled (#1313)
OpenXRay · Jun 28, 2023 · fa68671 · fa68671
1 parent d16e02e
commit fa68671
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/Layers/xrRender/ResourceManager.cpp b/src/Layers/xrRender/ResourceManager.cpp
@@ -313,14 +313,10 @@ Shader* CResourceManager::Create(LPCSTR s_shader, LPCSTR s_textures, LPCSTR s_co
     if (!GEnv.isDedicatedServer)
     {
 #if defined(USE_DX9)
-#   ifndef _EDITOR
-        if (_lua_HasShader(s_shader))
+        const bool useCppBlender = RImplementation.o.ffp && _GetBlender(s_shader);
+        if (!useCppBlender && _lua_HasShader(s_shader))
             return _lua_Create(s_shader, s_textures);
-        else
-#   endif
-        {
-            return _cpp_Create(s_shader, s_textures, s_constants, s_matrices);
-        }
+        return _cpp_Create(s_shader, s_textures, s_constants, s_matrices);
 #else // TODO: DX11: When all shaders are ready switch to common path
         if (_lua_HasShader(s_shader))
             return _lua_Create(s_shader, s_textures);