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 f0e3d326957ce681c770b0280c914c1bc08cb72f..7e9ca7fb6b58c9517e861d58235c555b8bade143 100644 (file)
--- 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;