]> 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)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Fri, 30 Jul 2010 05:26:39 +0000 (05:26 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10368 d7cf8633-e32d-0410-b094-e92efae38249

gl_rmain.c

index 7e978065d64efda8cb1b1f8c383d98385b832c3b..6ea51c2853997970a8117f2eae8183e642d71789 100644 (file)
@@ -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];
                }