From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 6 May 2007 10:12:19 +0000 (+0000)
Subject: fix a bug that caused GL20 render path to always ask for tangents and
X-Git-Tag: xonotic-v0.1.0preview~3215
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e5da53dfc5fbd1ac9ae704d7ec09f1af6acc3850;p=xonotic%2Fdarkplaces.git

fix a bug that caused GL20 render path to always ask for tangents and
normals when rendering models


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

diff --git a/gl_rmain.c b/gl_rmain.c
index 5d693170..11dc45a8 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -3982,9 +3982,9 @@ static void R_DrawTextureSurfaceList_GL20(int texturenumsurfaces, msurface_t **t
 		return;
 
 	if (rsurface_lightmode == 2)
-		RSurf_PrepareVerticesForBatch(true, r_glsl_permutation->loc_Texture_Normal, texturenumsurfaces, texturesurfacelist);
+		RSurf_PrepareVerticesForBatch(true, r_glsl_permutation->loc_Texture_Normal >= 0, texturenumsurfaces, texturesurfacelist);
 	else
-		RSurf_PrepareVerticesForBatch(r_glsl_permutation->loc_Texture_Normal, r_glsl_permutation->loc_Texture_Normal, texturenumsurfaces, texturesurfacelist);
+		RSurf_PrepareVerticesForBatch(r_glsl_permutation->loc_Texture_Normal >= 0, r_glsl_permutation->loc_Texture_Normal >= 0, texturenumsurfaces, texturesurfacelist);
 	R_Mesh_TexCoordPointer(0, 2, rsurface_model->surfmesh.data_texcoordtexture2f, rsurface_model->surfmesh.vbo, rsurface_model->surfmesh.vbooffset_texcoordtexture2f);
 	R_Mesh_TexCoordPointer(1, 3, rsurface_svector3f, rsurface_svector3f_bufferobject, rsurface_svector3f_bufferoffset);
 	R_Mesh_TexCoordPointer(2, 3, rsurface_tvector3f, rsurface_tvector3f_bufferobject, rsurface_tvector3f_bufferoffset);