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~230^2~110
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a23cd9d8cc867f89b1a8aece40544d99a558f548;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
---

diff --git a/gl_rmain.c b/gl_rmain.c
index 7e978065..6ea51c28 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -10460,6 +10460,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];
 		}