From 9f1f36ad0c1af5b54188faa9261343bce622fb26 Mon Sep 17 00:00:00 2001 From: havoc Date: Thu, 2 Feb 2006 13:52:00 +0000 Subject: [PATCH] fix a bug in the GLSL colormapping setup (was feeding a tinted pants/shirt color, should feed the raw colormap colors, because the shader is doing a multiply by light color on all of this) git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5938 d7cf8633-e32d-0410-b094-e92efae38249 --- r_shadow.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/r_shadow.c b/r_shadow.c index a1f45556..bd55014c 100644 --- a/r_shadow.c +++ b/r_shadow.c @@ -1662,8 +1662,8 @@ static void R_Shadow_RenderSurfacesLighting_Light_GLSL(const entity_render_t *en { R_Mesh_TexBind(5, R_GetTexture(pantstexture)); R_Mesh_TexBind(6, R_GetTexture(shirttexture)); - qglUniform3fARB(qglGetUniformLocationARB(r_shadow_lightprog, "Color_Pants"), lightcolorpants[0], lightcolorpants[1], lightcolorpants[2]);CHECKGLERROR - qglUniform3fARB(qglGetUniformLocationARB(r_shadow_lightprog, "Color_Shirt"), lightcolorshirt[0], lightcolorshirt[1], lightcolorshirt[2]);CHECKGLERROR + qglUniform3fARB(qglGetUniformLocationARB(r_shadow_lightprog, "Color_Pants"), ent->colormap_pantscolor[0], ent->colormap_pantscolor[1], ent->colormap_pantscolor[2]);CHECKGLERROR + qglUniform3fARB(qglGetUniformLocationARB(r_shadow_lightprog, "Color_Shirt"), ent->colormap_shirtcolor[0], ent->colormap_shirtcolor[1], ent->colormap_shirtcolor[2]);CHECKGLERROR } if (r_shadow_lightpermutation & SHADERPERMUTATION_FOG) { -- 2.39.2