From: divverent Date: Sun, 26 Apr 2009 19:05:49 +0000 (+0000) Subject: simplify shader decision logic in MiniMapSetupBrushes X-Git-Tag: svn-r421~85 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0a615ccf4f63c7551d54026ce231163a69df9f5f;p=xonotic%2Fnetradiant.git simplify shader decision logic in MiniMapSetupBrushes git-svn-id: svn://svn.icculus.org/netradiant/trunk@335 61c419a2-8eb2-4b30-bcec-8cead039b335 --- diff --git a/tools/quake3/q3map2/main.c b/tools/quake3/q3map2/main.c index e04f8dc6..73c92c60 100644 --- a/tools/quake3/q3map2/main.c +++ b/tools/quake3/q3map2/main.c @@ -346,6 +346,7 @@ void MiniMapSetupBrushes( void ) b = minimap.model->firstBSPBrush + i; brush = &bspBrushes[ b ]; +#if 0 /* check all sides */ compileFlags = 0; for( j = 0; j < brush->numSides; j++ ) @@ -362,6 +363,14 @@ void MiniMapSetupBrushes( void ) /* or together compile flags */ compileFlags |= si->compileFlags; } +#else + shader = &bspShaders[ brush->shaderNum ]; + si = ShaderInfoForShader( shader->shader ); + if( si == NULL ) + compileFlags = 0; + else + compileFlags = si->compileFlags; +#endif /* determine if this brush is solid */ if( (compileFlags & (C_SOLID | C_SKY)) == C_SOLID )