From 12a8e70662090771fa8444b8dfa05e287b235a0a Mon Sep 17 00:00:00 2001 From: divverent Date: Sun, 12 Jul 2009 17:39:51 +0000 Subject: [PATCH] support "none" in the _celshader key git-svn-id: svn://svn.icculus.org/netradiant/trunk@384 61c419a2-8eb2-4b30-bcec-8cead039b335 --- tools/quake3/q3map2/map.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/tools/quake3/q3map2/map.c b/tools/quake3/q3map2/map.c index f29d7d62..54f54441 100644 --- a/tools/quake3/q3map2/map.c +++ b/tools/quake3/q3map2/map.c @@ -1585,12 +1585,19 @@ static qboolean ParseMapEntity( qboolean onlyLights ) value = ValueForKey( &entities[ 0 ], "_celshader" ); if( value[ 0 ] != '\0' ) { - sprintf( shader, "textures/%s", value ); - celShader = ShaderInfoForShader( shader ); - Sys_Printf( "Entity %d (%s) has cel shader %s\n", mapEnt->mapEntityNum, classname, celShader->shader ); + if(strcmp(value, "none")) + { + sprintf( shader, "textures/%s", value ); + celShader = ShaderInfoForShader( shader ); + Sys_Printf( "Entity %d (%s) has cel shader %s\n", mapEnt->mapEntityNum, classname, celShader->shader ); + } + else + { + celShader = NULL; + } } else - celShader = *globalCelShader ? ShaderInfoForShader(globalCelShader) : NULL; + celShader = (*globalCelShader ? ShaderInfoForShader(globalCelShader) : NULL); /* jal : entity based _shadeangle */ shadeAngle = 0.0f; -- 2.39.2