diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-07-29 20:25:20 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-07-29 20:25:20 +0400 |
| commit | b818016d77d4669cb45a57666286c2e60d8d062a (patch) | |
| tree | 976004a3b940005004f360430c79cf4044a5a732 /source/gameengine/Ketsji/BL_Texture.cpp | |
| parent | c23532715281f7e14d750f019919b247920cdb50 (diff) | |
Apricot Branch
==============
svn merge -r15866:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender
Alpha blending and sorting changes, but also include some initial
support for GLSL lamps in dupligroups (only one duplicate works at
the moment).
Diffstat (limited to 'source/gameengine/Ketsji/BL_Texture.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/BL_Texture.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/source/gameengine/Ketsji/BL_Texture.cpp b/source/gameengine/Ketsji/BL_Texture.cpp index 204e7b2ce8d..f0ef84032f7 100644 --- a/source/gameengine/Ketsji/BL_Texture.cpp +++ b/source/gameengine/Ketsji/BL_Texture.cpp @@ -384,9 +384,6 @@ void BL_Texture::DisableUnit() void BL_Texture::DisableAllTextures() { - glDisable(GL_BLEND); - glDisable(GL_ALPHA_TEST); - for(int i=0; i<MAXTEX; i++) { if(GLEW_ARB_multitexture) glActiveTextureARB(GL_TEXTURE0_ARB+i); |