From: havoc Date: Mon, 5 Sep 2011 23:49:16 +0000 (+0000) Subject: disable divVerent's texflags hack for now because it is breaking X-Git-Tag: xonotic-v0.6.0~353 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=144cb76fdb0851157db2f80d7c30d98596e67c06;p=xonotic%2Fdarkplaces.git disable divVerent's texflags hack for now because it is breaking steelstorm's light interactions with transparent materials, until this issue can be investigated properly this code will be disabled git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11324 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=b8d8e2759007ef43aa26459b0a2f5fd3ae4394b0 --- diff --git a/model_shared.c b/model_shared.c index dc6e798e..5018ab9f 100644 --- a/model_shared.c +++ b/model_shared.c @@ -1970,6 +1970,10 @@ 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; @@ -1991,6 +1995,7 @@ 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;