From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 30 Jul 2010 05:26:39 +0000 (+0000)
Subject: don't apply colormod to shaders that use unusual custom blendfuncs
X-Git-Tag: xonotic-v0.1.0preview~302
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=28230db5b4fbbfdb3e5585a07e4e8f05d088a132;p=xonotic%2Fdarkplaces.git

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
---

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];
 		}