diff options
| author | Clément Fukhaut <turjuque@gmail.com> | 2016-02-22 00:38:57 +0300 |
|---|---|---|
| committer | Clément Fukhaut <turjuque@gmail.com> | 2016-02-22 00:38:57 +0300 |
| commit | 240e99506269377789126f1faf3beec90dfcbfa0 (patch) | |
| tree | 33d9fa7dd8336d85d87f96f31e47b7d4b891da5d /source/gameengine/Ketsji | |
| parent | 7e0cb40b4852a17142ac07c8c57ffce0c471902f (diff) | |
| parent | c359343f8dae6689c955dc1fa700cb26f6cd2e95 (diff) | |
Merge branch 'master' of git://git.blender.org/blender
Diffstat (limited to 'source/gameengine/Ketsji')
| -rw-r--r-- | source/gameengine/Ketsji/KX_BlenderMaterial.cpp | 17 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_BlenderMaterial.h | 1 |
2 files changed, 18 insertions, 0 deletions
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp index 1d185d52dc8..476fbd29b8b 100644 --- a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp +++ b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp @@ -972,6 +972,7 @@ PyMethodDef KX_BlenderMaterial::Methods[] = { KX_PYMETHODTABLE( KX_BlenderMaterial, getShader ), KX_PYMETHODTABLE( KX_BlenderMaterial, getMaterialIndex ), + KX_PYMETHODTABLE( KX_BlenderMaterial, getTextureBindcode ), KX_PYMETHODTABLE( KX_BlenderMaterial, setBlending ), {NULL,NULL} //Sentinel }; @@ -1325,4 +1326,20 @@ KX_PYMETHODDEF_DOC( KX_BlenderMaterial, setBlending , "setBlending( bge.logic.sr return NULL; } +KX_PYMETHODDEF_DOC(KX_BlenderMaterial, getTextureBindcode, "getTextureBindcode(texslot)") +{ + unsigned int texslot; + if (!PyArg_ParseTuple(args, "i:texslot", &texslot)) { + PyErr_SetString(PyExc_ValueError, "material.getTextureBindcode(texslot): KX_BlenderMaterial, expected an int."); + return NULL; + } + Image *ima = getImage(texslot); + if (ima) { + unsigned int *bindcode = ima->bindcode; + return PyLong_FromLong(*bindcode); + } + PyErr_SetString(PyExc_ValueError, "material.getTextureBindcode(texslot): KX_BlenderMaterial, invalid texture slot."); + return NULL; +} + #endif // WITH_PYTHON diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.h b/source/gameengine/Ketsji/KX_BlenderMaterial.h index df089cb7f99..a3d10c0a89d 100644 --- a/source/gameengine/Ketsji/KX_BlenderMaterial.h +++ b/source/gameengine/Ketsji/KX_BlenderMaterial.h @@ -133,6 +133,7 @@ public: KX_PYMETHOD_DOC(KX_BlenderMaterial, getMaterialIndex); KX_PYMETHOD_DOC(KX_BlenderMaterial, getTexture); KX_PYMETHOD_DOC(KX_BlenderMaterial, setTexture); + KX_PYMETHOD_DOC(KX_BlenderMaterial, getTextureBindcode); KX_PYMETHOD_DOC(KX_BlenderMaterial, setBlending); #endif /* WITH_PYTHON */ |