NLA SoC: Merge from 2.5 - 21179 to 21209

[blender.git] / source / gameengine / Ketsji / BL_BlenderShader.h

diff --git a/source/gameengine/Ketsji/BL_BlenderShader.h b/source/gameengine/Ketsji/BL_BlenderShader.h
index 5c1f59f94ade694e319e8bc791db6ede04299721..9af53bfc86323f3996ca8898ac00b6aa1608ea97 100644 (file)
--- a/source/gameengine/Ketsji/BL_BlenderShader.h
+++ b/source/gameengine/Ketsji/BL_BlenderShader.h
@@ -32,19 +32,28 @@ private:
        struct Material *mMat;
        int                             mLightLayer;
        int                             mBlendMode;
+       GPUMaterial     *mGPUMat;
 
-       bool                    VerifyShader();
+       bool                    VerifyShader() 
+       {
+               return (NULL != mGPUMat);
+       }
 
 public:
        BL_BlenderShader(KX_Scene *scene, struct Material *ma, int lightlayer);
        virtual ~BL_BlenderShader();
 
-       bool                            Ok();
+       bool                            Ok()
+       {
+               // same as VerifyShared
+               return (NULL != mGPUMat);
+       }
        void                            SetProg(bool enable, double time=0.0);
 
        int GetAttribNum();
        void SetAttribs(class RAS_IRasterizer* ras, const BL_Material *mat);
        void Update(const class RAS_MeshSlot & ms, class RAS_IRasterizer* rasty);
+       void ReloadMaterial();
        int GetBlendMode();
 
        bool Equals(BL_BlenderShader *blshader);