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_BlenderShader.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_BlenderShader.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/BL_BlenderShader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/BL_BlenderShader.cpp b/source/gameengine/Ketsji/BL_BlenderShader.cpp index f29408fbc6b..8b0bbc645a9 100644 --- a/source/gameengine/Ketsji/BL_BlenderShader.cpp +++ b/source/gameengine/Ketsji/BL_BlenderShader.cpp @@ -160,7 +160,7 @@ void BL_BlenderShader::Update( const KX_MeshSlot & ms, RAS_IRasterizer* rasty ) if(!mGPUMat) // || !mBound) return; - + MT_Matrix4x4 model; model.setValue(ms.m_OpenGLMatrix); MT_Matrix4x4 view; |