From 83ff5cf016ad81ebd590765490177af66eb0f17c Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Fri, 9 Dec 2011 17:24:33 +0100 Subject: [PATCH] mark two shader checks nullable --- tools/quake3/q3map2/fog.c | 2 +- tools/quake3/q3map2/light_trace.c | 2 +- tools/quake3/q3map2/light_ydnar.c | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/quake3/q3map2/fog.c b/tools/quake3/q3map2/fog.c index 1b23bad2..35e288ba 100644 --- a/tools/quake3/q3map2/fog.c +++ b/tools/quake3/q3map2/fog.c @@ -787,7 +787,7 @@ void CreateMapFogs( void ){ /* set up fog */ fog = &mapFogs[ numMapFogs++ ]; - fog->si = ShaderInfoForShader( globalFog ); + fog->si = ShaderInfoForShaderNull( globalFog ); if ( fog->si == NULL ) { Error( "Invalid shader \"%s\" referenced trying to add global fog", globalFog ); } diff --git a/tools/quake3/q3map2/light_trace.c b/tools/quake3/q3map2/light_trace.c index cc27fcc3..5fe77d07 100644 --- a/tools/quake3/q3map2/light_trace.c +++ b/tools/quake3/q3map2/light_trace.c @@ -1094,7 +1094,7 @@ static void PopulateWithPicoModel( int castShadows, picoModel_t *model, m4x4_t t if ( shader == NULL ) { continue; } - ti.si = ShaderInfoForShader( PicoGetShaderName( shader ) ); + ti.si = ShaderInfoForShaderNull( PicoGetShaderName( shader ) ); if ( ti.si == NULL ) { continue; } diff --git a/tools/quake3/q3map2/light_ydnar.c b/tools/quake3/q3map2/light_ydnar.c index 6c5a82e4..d2d0f9da 100644 --- a/tools/quake3/q3map2/light_ydnar.c +++ b/tools/quake3/q3map2/light_ydnar.c @@ -2824,8 +2824,6 @@ void SetupBrushesFlags( unsigned int mask_any, unsigned int test_any, unsigned i compileFlags |= si->compileFlags; } - Sys_FPrintf( SYS_VRB, "flags: %d (all: %d)\n", compileFlags, allCompileFlags ); - /* determine if this brush is opaque to light */ if( (compileFlags & mask_any) == test_any && (allCompileFlags & mask_all) == test_all ) {