From 48a8cb1d67990827779bc6b904b1bb6ed89b6506 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 ed59d7e..877b240 100644 --- a/tools/quake3/q3map2/fog.c +++ b/tools/quake3/q3map2/fog.c @@ -783,7 +783,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 ); fog->brush = NULL; diff --git a/tools/quake3/q3map2/light_trace.c b/tools/quake3/q3map2/light_trace.c index a328f46..d0b72d3 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 shader = PicoGetSurfaceShader( surface ); 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 bf5bc36..ed69504 100644 --- a/tools/quake3/q3map2/light_ydnar.c +++ b/tools/quake3/q3map2/light_ydnar.c @@ -3193,8 +3193,6 @@ void SetupBrushesFlags( int mask_any, int test_any, int mask_all, int test_all ) allCompileFlags &= 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 ) { -- 2.39.2