fix a bug in the GLSL colormapping setup (was feeding a tinted pants/shirt color...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5938 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/r_shadow.c b/r_shadow.c
index a1f4555657675716077f1d20a6d980e6059a8aa1..bd55014c4c7ee4d47b1141a8fd6155f96c077275 100644 (file)
--- 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)
        {