From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 10 Feb 2008 21:37:14 +0000 (+0000)
Subject: thanks to blub for locating the texture blending bug
X-Git-Tag: xonotic-v0.1.0preview~2436
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=38714056879d72705afdd7de8d2afede1f797414;p=xonotic%2Fdarkplaces.git

thanks to blub for locating the texture blending bug


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

diff --git a/gl_rmain.c b/gl_rmain.c
index 8d03b5ac..74339a75 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -5864,8 +5864,11 @@ static void R_DrawTextureSurfaceList_GL20(int texturenumsurfaces, msurface_t **t
 		R_Mesh_TexBind(GL20TU_SECONDARY_GLOSS, R_GetTexture(rsurface.texture->backgroundglosstexture));
 		R_Mesh_TexBind(GL20TU_SECONDARY_GLOW, R_GetTexture(rsurface.texture->backgroundcurrentskinframe->glow));
 	}
-	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_FOGMASK, R_GetTexture(r_texture_fogattenuation));
 	if ((rsurface.uselightmaptexture || (rsurface.texture->currentmaterialflags & MATERIALFLAG_FULLBRIGHT)) && !(rsurface.texture->currentmaterialflags & MATERIALFLAG_VERTEXTEXTUREBLEND))
 		R_Mesh_ColorPointer(NULL, 0, 0);