diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2012-07-14 08:43:32 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2012-07-14 08:43:32 +0400 |
| commit | ac8c56c6fc9e1a816160144b5cebe2e99ffa67fc (patch) | |
| tree | 230f0ffa161264ab51f961aa76ec0e33a92f807d /source/gameengine/Ketsji/KX_BlenderMaterial.h | |
| parent | aeaa95a525343d95258e9388076833530a6aa4ab (diff) | |
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).
Diffstat (limited to 'source/gameengine/Ketsji/KX_BlenderMaterial.h')
| -rw-r--r-- | source/gameengine/Ketsji/KX_BlenderMaterial.h | 2 |
1 files changed, 2 insertions, 0 deletions
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; |