]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
don't apply colormod to shaders that use unusual custom blendfuncs
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Fri, 30 Jul 2010 05:26:39 +0000 (05:26 +0000)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 3 Aug 2010 19:56:10 +0000 (21:56 +0200)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10368 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=a23cd9d8cc867f89b1a8aece40544d99a558f548

gl_rmain.c

index 662e5a28bf44b53cb2c79a9cb2fdbf13ab4798c3..637e5be5f1196435f74a22030bbc859907e0a28f 100644 (file)
@@ -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];
                }