diff options
author | Benoit Bolsee <benoit.bolsee@online.be> | 2008-11-05 16:22:10 +0300 |
---|---|---|
committer | Benoit Bolsee <benoit.bolsee@online.be> | 2008-11-05 16:22:10 +0300 |
commit | 8916f84622ccadbbb4111b03117cc6cc9ad9fe0a (patch) | |
tree | 9763e43d44746b120ce541a0cc4f663628be849b /source/gameengine/VideoTexture/Texture.h | |
parent | 3b2a07a8665be4c10b22e2ff84d45d67d86ffc79 (diff) |
VideoTexture: Add support for GLSL. FIx small printout bug in Exception printout
Diffstat (limited to 'source/gameengine/VideoTexture/Texture.h')
-rw-r--r-- | source/gameengine/VideoTexture/Texture.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/gameengine/VideoTexture/Texture.h b/source/gameengine/VideoTexture/Texture.h index 569e34da121..3c371e51537 100644 --- a/source/gameengine/VideoTexture/Texture.h +++ b/source/gameengine/VideoTexture/Texture.h @@ -39,9 +39,11 @@ struct Texture { PyObject_HEAD + // texture is using blender material + bool m_useMatTexture; + // video texture bind code unsigned int m_actTex; - // original texture bind code unsigned int m_orgTex; // original texture saved @@ -70,9 +72,6 @@ struct Texture // Texture type description extern PyTypeObject TextureType; -// usage of Blender materials -extern bool blendMats; - // load texture void loadTexture (unsigned int texId, unsigned int * texture, short * size, bool mipmap = false); |