From ac8c56c6fc9e1a816160144b5cebe2e99ffa67fc Mon Sep 17 00:00:00 2001 From: Mitchell Stokes Date: Sat, 14 Jul 2012 04:43:32 +0000 Subject: BGE: Better fix for the textures not working with custom shaders regression. Now custom shaders work, and textures aren't uploaded twice for GLSL materials (my earlier fix had some bad logic). --- source/gameengine/Ketsji/KX_BlenderMaterial.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source/gameengine/Ketsji/KX_BlenderMaterial.h') diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.h b/source/gameengine/Ketsji/KX_BlenderMaterial.h index 3a6dda06320..8fc86ef9cf2 100644 --- a/source/gameengine/Ketsji/KX_BlenderMaterial.h +++ b/source/gameengine/Ketsji/KX_BlenderMaterial.h @@ -138,6 +138,8 @@ private: bool mModified; bool mConstructed; // if false, don't clean on exit + void InitTextures(); + void SetBlenderGLSLShader(int layer); void ActivatGLMaterials( RAS_IRasterizer* rasty )const; -- cgit v1.2.3