mark two shader checks nullable

diff --git a/tools/quake3/q3map2/fog.c b/tools/quake3/q3map2/fog.c
index ed59d7eb90f765946475e3465a76f59ed43f75b0..877b240e582b9fd56c554b3fbf1269a2c685084c 100644 (file)
--- 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 a328f4666bc619b1708178da9ea47189b6ba53b5..d0b72d35968ef58d06c7afc82a0630c2a64800fe 100644 (file)
--- 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 bf5bc36c34b90a72d785696daa837368e45f7918..ed69504dd2783b58d4b291d94fd8a89c5fe22b3e 100644 (file)
--- 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 )
                {