ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2025-01-10 03:51:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

mark two shader checks nullable

Browse source
This commit is contained in:
Rudolf Polzer 2011-12-09 17:24:33 +01:00 committed by Thomas Debesse
parent d590a482aa
commit 83ff5cf016
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

@ -787,7 +787,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 );
} }

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

@ -1094,7 +1094,7 @@ static void PopulateWithPicoModel( int castShadows, picoModel_t *model, m4x4_t t
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

@ -2824,8 +2824,6 @@ void SetupBrushesFlags( unsigned int mask_any, unsigned int test_any, unsigned i
compileFlags |= si->compileFlags; compileFlags |= 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 )
{ {