From: Rudolf Polzer <divverent@xonotic.org>
Date: Fri, 9 Dec 2011 16:24:33 +0000 (+0100)
Subject: mark two shader checks nullable
X-Git-Tag: xonotic-v0.6.0~43
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=48a8cb1d67990827779bc6b904b1bb6ed89b6506;p=xonotic%2Fnetradiant.git

mark two shader checks nullable
---

diff --git a/tools/quake3/q3map2/fog.c b/tools/quake3/q3map2/fog.c
index ed59d7eb..877b240e 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 a328f466..d0b72d35 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 bf5bc36c..ed69504d 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 )
 		{