svn merge -r 15392:15551 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / gameengine / Ketsji / KX_BlenderMaterial.h
index 62e96b71937e8d7c84b8157265668a561e2912c7..bf6d2095e7c9b4e35c9dce144860be562d3576ef 100644 (file)
@@ -94,6 +94,7 @@ private:
        BL_Material*            mMaterial;
        BL_Shader*                      mShader;
        BL_BlenderShader*       mBlenderShader;
+       static BL_BlenderShader *mLastBlenderShader;
        KX_Scene*               mScene;
        BL_Texture              mTextures[MAXTEX];              // texture array
        bool                    mUserDefBlend;
@@ -106,6 +107,7 @@ private:
        void ActivatGLMaterials( RAS_IRasterizer* rasty )const;
        void ActivateTexGen( RAS_IRasterizer *ras ) const;
 
+       bool UsesLighting(RAS_IRasterizer *rasty) const;
 
        // message centers
        void    setTexData( bool enable,RAS_IRasterizer *ras);