From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 21 Dec 2006 09:12:21 +0000 (+0000)
Subject: removed Q3TEXTUREFLAG_ALPHATEST uses in the code, fixing a bug that made alpha test... 
X-Git-Tag: xonotic-v0.1.0preview~3738
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f009ae2df865552ee37ca204a137679cb43941b4;p=xonotic%2Fdarkplaces.git

removed Q3TEXTUREFLAG_ALPHATEST uses in the code, fixing a bug that made alpha test surfaces not be alpha tested (now checks shader->layers[0].alphatest)


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

diff --git a/model_brush.c b/model_brush.c
index 750c27dc..ff2dd8b7 100644
--- a/model_brush.c
+++ b/model_brush.c
@@ -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;
diff --git a/model_brush.h b/model_brush.h
index 9660c484..562c6a00 100644
--- a/model_brush.h
+++ b/model_brush.h
@@ -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