From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 28 Feb 2007 09:50:36 +0000 (+0000)
Subject: improved detection of q3 terrain blend shaders to reduce chances of a misidentification
X-Git-Tag: xonotic-v0.1.0preview~3493
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=e5c94e1dacbd569f6638687feedb1fb050bde1dc

improved detection of q3 terrain blend shaders to reduce chances of a misidentification


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6923 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/model_brush.c b/model_brush.c
index f0e3d326..7e9ca7fb 100644
--- a/model_brush.c
+++ b/model_brush.c
@@ -4399,7 +4399,9 @@ static void Mod_Q3BSP_LoadShaders(void)
 			if (shader->numlayers)
 			{
 				shader->primarylayer = shader->layers + 0;
-				if ((shader->layers[1].blendfunc[0] == GL_SRC_ALPHA && shader->layers[1].blendfunc[1] == GL_ONE_MINUS_SRC_ALPHA) || shader->layers[1].alphatest)
+				if ((shader->layers[0].blendfunc[0] == GL_ONE       && shader->layers[0].blendfunc[1] == GL_ZERO                && !shader->layers[0].alphatest)
+				&& ((shader->layers[1].blendfunc[0] == GL_SRC_ALPHA && shader->layers[1].blendfunc[1] == GL_ONE_MINUS_SRC_ALPHA && !shader->layers[0].alphatest)
+				||  (shader->layers[1].blendfunc[0] == GL_ONE       && shader->layers[1].blendfunc[1] == GL_ZERO                &&  shader->layers[1].alphatest)))
 				{
 					// terrain blending or other effects
 					shader->backgroundlayer = shader->layers + 0;