yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-01-20 08:21:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix gl_ext_multitexturing set to 1

Browse source
This commit is contained in:
Yamagi Burmeister 2012-02-09 15:11:35 +00:00
parent 4b1c43e98a
commit cf7d2645cc
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/refresh/r_lightmap.c
View file

@ -284,14 +284,8 @@ LM_BeginBuildingLightmaps ( model_t *m )
R_Bind( gl_state.lightmap_textures + 0 ); R_Bind( gl_state.lightmap_textures + 0 );
qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
qglTexImage2D( GL_TEXTURE_2D, qglTexImage2D( GL_TEXTURE_2D, 0, gl_lms.internal_format, BLOCK_WIDTH, BLOCK_HEIGHT,
0, 0, GL_LIGHTMAP_FORMAT, GL_UNSIGNED_BYTE, dummy );
gl_lms.internal_format,
BLOCK_WIDTH, BLOCK_HEIGHT,
0,
GL_LIGHTMAP_FORMAT,
GL_UNSIGNED_BYTE,
dummy );
} }
void void

6
src/refresh/r_surf.c
View file

@ -927,8 +927,6 @@ R_DrawBrushModel ( entity_t *e )
R_TexEnv( GL_REPLACE ); R_TexEnv( GL_REPLACE );
R_SelectTexture( QGL_TEXTURE1 ); R_SelectTexture( QGL_TEXTURE1 );
R_DrawInlineBModel();
if ( !gl_config.mtexcombine ) if ( !gl_config.mtexcombine )
{ {
R_TexEnv( GL_REPLACE ); R_TexEnv( GL_REPLACE );
@ -976,6 +974,9 @@ R_DrawBrushModel ( entity_t *e )
} }
} }
R_DrawInlineBModel();
R_EnableMultitexture( false );
qglPopMatrix(); qglPopMatrix();
} }
@ -1198,7 +1199,6 @@ R_DrawWorld ( void )
} }
R_RecursiveWorldNode( r_worldmodel->nodes ); R_RecursiveWorldNode( r_worldmodel->nodes );
R_EnableMultitexture( false ); R_EnableMultitexture( false );
} }
else else