From 28230db5b4fbbfdb3e5585a07e4e8f05d088a132 Mon Sep 17 00:00:00 2001 From: havoc Date: Fri, 30 Jul 2010 05:26:39 +0000 Subject: [PATCH] don't apply colormod to shaders that use unusual custom blendfuncs git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10368 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=a23cd9d8cc867f89b1a8aece40544d99a558f548 --- gl_rmain.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gl_rmain.c b/gl_rmain.c index 662e5a28..637e5be5 100644 --- a/gl_rmain.c +++ b/gl_rmain.c @@ -9520,6 +9520,8 @@ texture_t *R_GetCurrentTexture(texture_t *t) } else if (t->currentmaterialflags & MATERIALFLAG_CUSTOMBLEND) { + // don't colormod customblend textures + VectorSet(t->lightmapcolor, 1, 1, 1); blendfunc1 = t->customblendfunc[0]; blendfunc2 = t->customblendfunc[1]; } -- 2.39.2