From 92ebbdfc10cbc503b7ee55ad96c5ccf8fc7af514 Mon Sep 17 00:00:00 2001
From: Hannu Hanhi <hhanhipublic@gmail.com>
Date: Sat, 18 Jul 2020 15:48:37 +0300
Subject: [PATCH] Don't override custom shaders with model lighting shader
---
src/hardware/r_opengl/r_opengl.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c
index 81f5fd2469..d20721219e 100644
--- a/src/hardware/r_opengl/r_opengl.c
+++ b/src/hardware/r_opengl/r_opengl.c
@@ -1107,8 +1107,9 @@ EXPORT void HWRAPI(SetShader) (int shader)
if (gl_allowshaders)
{
// If using model lighting, set the appropriate shader.
+ // However don't override a custom shader.
// Should use an enum or something...
- if (shader == 4 && model_lighting)
+ if (shader == 4 && model_lighting && !gl_shaderprograms[4].custom)
shader = 8;
if ((GLuint)shader != gl_currentshaderprogram)
{
--
GitLab