Merge branch 'master' into alias5

This commit is contained in:
Eric Wasylishen 2014-11-11 16:51:44 -07:00
commit 6c5f18b56e
2 changed files with 0 additions and 7 deletions

View file

@ -46,9 +46,6 @@ vec3_t vpn;
vec3_t vright;
vec3_t r_origin;
float r_world_matrix[16];
float r_base_world_matrix[16];
float r_fovx, r_fovy; //johnfitz -- rendering fov may be different becuase of r_waterwarp and r_stereo
//
@ -342,8 +339,6 @@ void R_SetupGL (void)
glRotatef (-r_refdef.viewangles[1], 0, 0, 1);
glTranslatef (-r_refdef.vieworg[0], -r_refdef.vieworg[1], -r_refdef.vieworg[2]);
glGetFloatv (GL_MODELVIEW_MATRIX, r_world_matrix);
//
// set drawing parms
//

View file

@ -148,8 +148,6 @@ extern cvar_t gl_playermip;
extern cvar_t gl_subdivide_size;
extern float load_subdivide_size; //johnfitz -- remember what subdivide_size value was when this map was loaded
extern float r_world_matrix[16];
// Multitexture
extern qboolean mtexenabled;
extern qboolean gl_mtexable;