From cfde45d9fcb00f9c9a45e1ea54f0b12f0423867b Mon Sep 17 00:00:00 2001
From: Spoike <acceptthis@users.sourceforge.net>
Date: Sat, 2 Oct 2010 10:39:55 +0000
Subject: [PATCH] compile fixes

git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3609 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/client/merged.h | 3 ++-
 engine/gl/gl_backend.c | 6 ++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/engine/client/merged.h b/engine/client/merged.h
index 5e21f67c0..d82bcb3f1 100644
--- a/engine/client/merged.h
+++ b/engine/client/merged.h
@@ -156,13 +156,14 @@ typedef union {
 	void *ptr;
 #endif
 } texid_t;
+enum uploadfmt;
 
 typedef struct rendererinfo_s {
 	char *description;
 	char *name[4];
 	r_qrenderer_t rtype;
 
-	mpic_t	*(*Draw_SafePicFromWad)			(char *name);
+	mpic_t	*(*Draw_SafePicFromWad)		(char *name);
 	mpic_t	*(*Draw_SafeCachePic)		(char *path);
 	void	(*Draw_Init)				(void);
 	void	(*Draw_Shutdown)			(void);
diff --git a/engine/gl/gl_backend.c b/engine/gl/gl_backend.c
index d29cf3318..ca476ff01 100644
--- a/engine/gl/gl_backend.c
+++ b/engine/gl/gl_backend.c
@@ -458,10 +458,6 @@ void GL_SelectVBO(int vbo)
 }
 void GL_SelectEBO(int vbo)
 {
-	extern cvar_t temp1;
-	if (temp1.ival && shaderstate.meshcount != 1)
-		vbo = 0;
-
 #ifndef FORCESTATE
 	if (shaderstate.currentebo != vbo)
 #endif
@@ -1896,6 +1892,7 @@ static void BE_SubmitMeshChain(void)
 	int m;
 	mesh_t *mesh;
 
+#if 0
 	if (!shaderstate.currentebo)
 	{
 	if (shaderstate.meshcount == 1)
@@ -1937,6 +1934,7 @@ static void BE_SubmitMeshChain(void)
 
 	return;
 	}
+#endif
 
 /*
 	if (qglLockArraysEXT)