quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mark two shader checks nullable

Browse Source
This commit is contained in:
Rudolf Polzer 2011-12-09 17:24:33 +01:00
parent b104009ba6
commit 48a8cb1d67
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/quake3/q3map2/fog.c
View File

@ -783,7 +783,7 @@ void CreateMapFogs( void )
/* set up fog */ /* set up fog */
fog = &mapFogs[ numMapFogs++ ]; fog = &mapFogs[ numMapFogs++ ];
fog->si = ShaderInfoForShader( globalFog ); fog->si = ShaderInfoForShaderNull( globalFog );
if( fog->si == NULL ) if( fog->si == NULL )
Error( "Invalid shader \"%s\" referenced trying to add global fog", globalFog ); Error( "Invalid shader \"%s\" referenced trying to add global fog", globalFog );
fog->brush = NULL; fog->brush = NULL;

2
tools/quake3/q3map2/light_trace.c
View File

@ -1094,7 +1094,7 @@ static void PopulateWithPicoModel( int castShadows, picoModel_t *model, m4x4_t t
shader = PicoGetSurfaceShader( surface ); shader = PicoGetSurfaceShader( surface );
if( shader == NULL ) if( shader == NULL )
continue; continue;
ti.si = ShaderInfoForShader( PicoGetShaderName( shader ) ); ti.si = ShaderInfoForShaderNull( PicoGetShaderName( shader ) );
if( ti.si == NULL ) if( ti.si == NULL )
continue; continue;

2
tools/quake3/q3map2/light_ydnar.c
View File

@ -3193,8 +3193,6 @@ void SetupBrushesFlags( int mask_any, int test_any, int mask_all, int test_all )
allCompileFlags &= si->compileFlags; allCompileFlags &= si->compileFlags;
} }
Sys_FPrintf( SYS_VRB, "flags: %d (all: %d)\n", compileFlags, allCompileFlags );
/* determine if this brush is opaque to light */ /* determine if this brush is opaque to light */
if( (compileFlags & mask_any) == test_any && (allCompileFlags & mask_all) == test_all ) if( (compileFlags & mask_any) == test_any && (allCompileFlags & mask_all) == test_all )
{ {