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/KX_BlenderMaterial.h | |
| 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/KX_BlenderMaterial.h')
| -rw-r--r-- | source/gameengine/Ketsji/KX_BlenderMaterial.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.h b/source/gameengine/Ketsji/KX_BlenderMaterial.h index 5bbf81d225c..0d7657b8cdb 100644 --- a/source/gameengine/Ketsji/KX_BlenderMaterial.h +++ b/source/gameengine/Ketsji/KX_BlenderMaterial.h @@ -121,14 +121,11 @@ private: void setLightData(); - static void setBlendingMode(int transp); - // cleanup stuff void OnExit(); // shader chacing static BL_BlenderShader *mLastBlenderShader; - static int mLastBlenderShaderBlend; static BL_Shader *mLastShader; mutable int mPass; |