]> de.git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
remove some undesired else's that break r_celshading and r_celoutlines
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Sat, 18 Feb 2012 21:52:00 +0000 (21:52 +0000)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 18 Mar 2012 20:25:52 +0000 (21:25 +0100)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11700 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=9d4b72962f09d1696834b8339644c77000c9c125

gl_rmain.c

index 59475e6343f8fcd758da919df0f282c6f7fd88e0..256b5e446412417f8cbc989932d60da99a644ddb 100644 (file)
@@ -901,9 +901,9 @@ qboolean R_CompileShader_CheckStaticParms(void)
                R_COMPILESHADER_STATICPARM_ENABLE(SHADERSTATICPARM_SHADOWMAPPCF_2);
        else if (r_shadow_shadowmappcf)
                R_COMPILESHADER_STATICPARM_ENABLE(SHADERSTATICPARM_SHADOWMAPPCF_1);
-       else if (r_celshading.integer)
+       if (r_celshading.integer)
                R_COMPILESHADER_STATICPARM_ENABLE(SHADERSTATICPARM_CELSHADING);
-       else if (r_celoutlines.integer)
+       if (r_celoutlines.integer)
                R_COMPILESHADER_STATICPARM_ENABLE(SHADERSTATICPARM_CELOUTLINES);
 
        return memcmp(r_compileshader_staticparms, r_compileshader_staticparms_save, sizeof(r_compileshader_staticparms)) != 0;