okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'HEAD' of https://github.com/ioquake/ioq3.git into suntest

Browse source
This commit is contained in:
SmileTheory 2013-04-02 00:18:24 -07:00
commit 6a763f0671
35 changed files with 106 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

3
code/renderergl2/tr_shader.c
View file

@ -1766,7 +1766,7 @@ static qboolean ParseShader( char **text )
// light <value> determines flaring in q3map, not needed here
else if ( !Q_stricmp(token, "light") )
{
token = COM_ParseExt( text, qfalse );
COM_ParseExt( text, qfalse );
continue;
}
// cull <face>
@ -2931,7 +2931,6 @@ static shader_t *FinishShader( void ) {
//
if ( stage > 1 && ( (r_vertexLight->integer && !r_uiFullScreen->integer) || glConfig.hardwareType == GLHW_PERMEDIA2 ) ) {
VertexLightingCollapse();
stage = 1;
hasLightmapStage = qfalse;
}