]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
Revert "disable divVerent's texflags hack for now because it is breaking"
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Tue, 6 Sep 2011 17:02:29 +0000 (17:02 +0000)
committerdivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Tue, 6 Sep 2011 17:02:29 +0000 (17:02 +0000)
This reverts commit b8d8e2759007ef43aa26459b0a2f5fd3ae4394b0.

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

model_shared.c

index 5018ab9f150ceede63d2d309e95a56f5bd9cdbb8..dc6e798e366d542c970434d0f5664c8e564d0532 100644 (file)
@@ -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;