removed Q3TEXTUREFLAG_ALPHATEST uses in the code, fixing a bug that made alpha test...
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 21 Dec 2006 09:12:21 +0000 (09:12 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 21 Dec 2006 09:12:21 +0000 (09:12 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6662 d7cf8633-e32d-0410-b094-e92efae38249

model_brush.c
model_brush.h

index 750c27d..ff2dd8b 100644 (file)
@@ -4343,7 +4343,7 @@ static void Mod_Q3BSP_LoadTextures(lump_t *l)
                                out->basematerialflags |= MATERIALFLAG_WATER | MATERIALFLAG_WATERALPHA;
                        else
                                out->basematerialflags |= MATERIALFLAG_WALL;
-                       if (shader->textureflags & Q3TEXTUREFLAG_ALPHATEST)
+                       if (shader->layers[0].alphatest)
                                out->basematerialflags |= MATERIALFLAG_ALPHATEST | MATERIALFLAG_TRANSPARENT;
                        out->customblendfunc[0] = GL_ONE;
                        out->customblendfunc[1] = GL_ZERO;
@@ -4383,8 +4383,6 @@ Q3 shader blendfuncs actually used in the game (* = supported by DP)
                                        else
                                                out->basematerialflags |= MATERIALFLAG_CUSTOMBLEND | MATERIALFLAG_FULLBRIGHT | MATERIALFLAG_BLENDED | MATERIALFLAG_TRANSPARENT;
                                }
-                               if (shader->layers[0].alphatest)
-                                       shader->textureflags |= Q3TEXTUREFLAG_ALPHATEST;
                        }
                        if (!shader->lighting)
                                out->basematerialflags |= MATERIALFLAG_FULLBRIGHT;
index 9660c48..562c6a0 100644 (file)
@@ -639,7 +639,6 @@ q3dpvs_t;
 #define Q3TEXTUREFLAG_TWOSIDED 1
 #define Q3TEXTUREFLAG_AUTOSPRITE 2
 #define Q3TEXTUREFLAG_AUTOSPRITE2 4
-#define Q3TEXTUREFLAG_ALPHATEST 8
 #define Q3TEXTUREFLAG_NOPICMIP 16
 
 typedef struct q3mbrush_s