]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
now that DDS loading is consistent with RGBA loading again, let's properly set TEXF_A...
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Tue, 6 Sep 2011 17:26:54 +0000 (17:26 +0000)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 11 Sep 2011 13:57:03 +0000 (15:57 +0200)
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
::stable-branch::merge=e5a3f9b08901300af64ee36273deaba8f6c49935

model_shared.c

index c4907d069621a0ac034ebdf8ef04fb88d1797b28..a524191309dafbc11cf8d0b94091b0f6850f97b4 100644 (file)
@@ -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))