From: divverent Date: Tue, 6 Sep 2011 17:02:29 +0000 (+0000) Subject: Revert "disable divVerent's texflags hack for now because it is breaking" X-Git-Tag: xonotic-v0.6.0~163^2~227 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cf41db5c7b7f87d51ed62d8999338a2349eceb8d;p=xonotic%2Fdarkplaces.git Revert "disable divVerent's texflags hack for now because it is breaking" This reverts commit b8d8e2759007ef43aa26459b0a2f5fd3ae4394b0. git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11325 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/model_shared.c b/model_shared.c index 5018ab9f..dc6e798e 100644 --- a/model_shared.c +++ b/model_shared.c @@ -1970,10 +1970,6 @@ void Mod_LoadQ3Shaders(void) shader.textureblendalpha = true; } } -#if 1 - // LordHavoc: use this code until divVerent is able to fix the other code - layer->texflags = TEXF_ALPHA; -#else layer->texflags = 0; if (layer->alphatest) layer->texflags |= TEXF_ALPHA; @@ -1995,7 +1991,6 @@ void Mod_LoadQ3Shaders(void) // 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; -#endif if (!(shader.surfaceparms & Q3SURFACEPARM_NOMIPMAPS)) layer->texflags |= TEXF_MIPMAP;