Apricot Branch: GLSL

====================

* Added ObColor support, though it works different than for TexFaces.
  It used a new ObColor option in the materials, which will modulate
  the final color/alpha with the object color and alpha, also works
  in the render engine.
* Made GLSL check the ZTransp flag. A material is now only drawn
  transparent if this flag is enabled, a bit more consistent with the
  render engine.
* Fix for bug #17359: crash related subsurf + editmode GLSL.

1 files changed, 2 insertions, 0 deletions

diff --git a/source/gameengine/Ketsji/BL_BlenderShader.h b/source/gameengine/Ketsji/BL_BlenderShader.h
index 63801195ecf..a548aed6de2 100644
--- a/source/gameengine/Ketsji/BL_BlenderShader.h
+++ b/source/gameengine/Ketsji/BL_BlenderShader.h
@@ -33,6 +33,7 @@ private:
 	GPUMaterial		*mGPUMat;
 	bool			mBound;
 	int				mLightLayer;
+	int				mBlendMode;
 
 	bool			VerifyShader();
 
@@ -46,6 +47,7 @@ public:
 	int GetAttribNum();
 	void SetAttribs(class RAS_IRasterizer* ras, const BL_Material *mat);
 	void Update(const class KX_MeshSlot & ms, class RAS_IRasterizer* rasty);
+	int GetBlendMode();
 
 	bool Equals(BL_BlenderShader *blshader);
 };