From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 6 Sep 2011 17:26:54 +0000 (+0000)
Subject: now that DDS loading is consistent with RGBA loading again, let's properly set TEXF_A... 
X-Git-Tag: xonotic-v0.6.0~163^2~224
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e5a3f9b08901300af64ee36273deaba8f6c49935;p=xonotic%2Fdarkplaces.git

now that DDS loading is consistent with RGBA loading again, let's properly set TEXF_ALPHA _only_ if the blendfunc uses alpha

THIS BREAKS blendfunc add WITH ALPHA CHANNEL, AS THE ALPHA CHANNEL IS NOW PROPERLY IGNORED.

Use blendfunc GL_SRC_ALPHA GL_ONE if you want to add with alpha channel!

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

diff --git a/model_shared.c b/model_shared.c
index c4907d06..a5241913 100644
--- a/model_shared.c
+++ b/model_shared.c
@@ -1988,10 +1988,6 @@ void Mod_LoadQ3Shaders(void)
 							break;
 					}
 
-					// nasty hack because DP treats this the same as GL_SRC_ALPHA GL_ONE
-					if(layer->blendfunc[0] == GL_ONE && layer->blendfunc[1] == GL_ONE)
-						layer->texflags |= TEXF_ALPHA;
-
 					if (!(shader.surfaceparms & Q3SURFACEPARM_NOMIPMAPS))
 						layer->texflags |= TEXF_MIPMAP;
 					if (!(shader.textureflags & Q3TEXTUREFLAG_NOPICMIP))