From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 4 May 2008 22:55:54 +0000 (+0000)
Subject: fix bug with rtlights on vertex texture blend surfaces (such as in
X-Git-Tag: xonotic-v0.1.0preview~2253
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cc8f0a961ced175ad07c383758275764657637b6;p=xonotic%2Fdarkplaces.git

fix bug with rtlights on vertex texture blend surfaces (such as in
pom.bsp) that was causing them to white out


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

diff --git a/r_shadow.c b/r_shadow.c
index e3de2afb..eb324479 100644
--- a/r_shadow.c
+++ b/r_shadow.c
@@ -1550,8 +1550,11 @@ static void R_Shadow_RenderLighting_Light_GLSL(int firstvertex, int numvertices,
 	}
 	//R_Mesh_TexBindCubeMap(GL20TU_CUBE, R_GetTexture(rsurface.rtlight->currentcubemap));
 	R_Mesh_TexBind(GL20TU_FOGMASK, R_GetTexture(r_texture_fogattenuation));
-	R_Mesh_TexBind(GL20TU_PANTS, R_GetTexture(rsurface.texture->currentskinframe->pants));
-	R_Mesh_TexBind(GL20TU_SHIRT, R_GetTexture(rsurface.texture->currentskinframe->shirt));
+	if(rsurface.texture->colormapping)
+	{
+		R_Mesh_TexBind(GL20TU_PANTS, R_GetTexture(rsurface.texture->currentskinframe->pants));
+		R_Mesh_TexBind(GL20TU_SHIRT, R_GetTexture(rsurface.texture->currentskinframe->shirt));
+	}
 	R_Mesh_TexBind(GL20TU_ATTENUATION, R_GetTexture(r_shadow_attenuationgradienttexture));
 	R_Mesh_TexCoordPointer(0, 2, rsurface.texcoordtexture2f, rsurface.texcoordtexture2f_bufferobject, rsurface.texcoordtexture2f_bufferoffset);
 	R_Mesh_TexCoordPointer(1, 3, rsurface.svector3f, rsurface.svector3f_bufferobject, rsurface.svector3f_bufferoffset);