From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 21 Mar 2005 09:58:21 +0000 (+0000)
Subject: fix 3 NULL vertex pointer crashes (caused by R_Mesh_State lingering where it shouldn't)
X-Git-Tag: xonotic-v0.1.0preview~5056
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0c7a33cb8b77b9f7c9885c67224428b9e8f0adc0;p=xonotic%2Fdarkplaces.git

fix 3 NULL vertex pointer crashes (caused by R_Mesh_State lingering where it shouldn't)


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

diff --git a/gl_rsurf.c b/gl_rsurf.c
index 8fb25584..2b0f9513 100644
--- a/gl_rsurf.c
+++ b/gl_rsurf.c
@@ -648,7 +648,6 @@ static void R_DrawSurfaceList(const entity_render_t *ent, texture_t *texture, in
 							}
 						}
 					}
-					R_Mesh_State(&m);
 					GL_LockArrays(0, surface->mesh.num_vertices);
 					R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i);
 					GL_LockArrays(0, 0);
@@ -775,7 +774,6 @@ static void R_DrawSurfaceList(const entity_render_t *ent, texture_t *texture, in
 									c[3] = a;
 								}
 							}
-							R_Mesh_State(&m);
 							GL_LockArrays(0, surface->mesh.num_vertices);
 							R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i);
 							GL_LockArrays(0, 0);
@@ -805,7 +803,6 @@ static void R_DrawSurfaceList(const entity_render_t *ent, texture_t *texture, in
 								R_Mesh_ColorPointer(NULL);
 								GL_Color(r, g, b, a);
 							}
-							R_Mesh_State(&m);
 							GL_LockArrays(0, surface->mesh.num_vertices);
 							R_Mesh_Draw(surface->mesh.num_vertices, surface->mesh.num_triangles, surface->mesh.data_element3i);
 							GL_LockArrays(0, 0);