From cf7d2645cc7024a9d1945213ad896c4df8ecdcb7 Mon Sep 17 00:00:00 2001 From: Yamagi Burmeister Date: Thu, 9 Feb 2012 15:11:35 +0000 Subject: [PATCH] Fix gl_ext_multitexturing set to 1 --- src/refresh/r_lightmap.c | 10 ++-------- src/refresh/r_surf.c | 6 +++--- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/refresh/r_lightmap.c b/src/refresh/r_lightmap.c index f7f7a0df..0433c98f 100644 --- a/src/refresh/r_lightmap.c +++ b/src/refresh/r_lightmap.c @@ -284,14 +284,8 @@ LM_BeginBuildingLightmaps ( model_t *m ) R_Bind( gl_state.lightmap_textures + 0 ); qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); - qglTexImage2D( GL_TEXTURE_2D, - 0, - gl_lms.internal_format, - BLOCK_WIDTH, BLOCK_HEIGHT, - 0, - GL_LIGHTMAP_FORMAT, - GL_UNSIGNED_BYTE, - dummy ); + qglTexImage2D( GL_TEXTURE_2D, 0, gl_lms.internal_format, BLOCK_WIDTH, BLOCK_HEIGHT, + 0, GL_LIGHTMAP_FORMAT, GL_UNSIGNED_BYTE, dummy ); } void diff --git a/src/refresh/r_surf.c b/src/refresh/r_surf.c index 9f16cd08..8f5b6170 100644 --- a/src/refresh/r_surf.c +++ b/src/refresh/r_surf.c @@ -927,8 +927,6 @@ R_DrawBrushModel ( entity_t *e ) R_TexEnv( GL_REPLACE ); R_SelectTexture( QGL_TEXTURE1 ); - R_DrawInlineBModel(); - if ( !gl_config.mtexcombine ) { R_TexEnv( GL_REPLACE ); @@ -976,6 +974,9 @@ R_DrawBrushModel ( entity_t *e ) } } + R_DrawInlineBModel(); + R_EnableMultitexture( false ); + qglPopMatrix(); } @@ -1198,7 +1199,6 @@ R_DrawWorld ( void ) } R_RecursiveWorldNode( r_worldmodel->nodes ); - R_EnableMultitexture( false ); } else