Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Bolsee <benoit.bolsee@online.be>2009-04-21 01:20:33 +0400
committerBenoit Bolsee <benoit.bolsee@online.be>2009-04-21 01:20:33 +0400
commit2d0d06f642b661b084657c05ebb0c664f998a937 (patch)
treef08f660611fccfd3cd2be659a3440fa54c1c96de /source/gameengine/VideoTexture/BlendType.h
parent6afaab654d6d9df31f6cb01e8e2c834ae79927fb (diff)
BGE VideoTexture: fix bug with VideoTexture.materialID() since recent commit.
Diffstat (limited to 'source/gameengine/VideoTexture/BlendType.h')
-rw-r--r--source/gameengine/VideoTexture/BlendType.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/gameengine/VideoTexture/BlendType.h b/source/gameengine/VideoTexture/BlendType.h
index ac3ed8812a6..8b243c43912 100644
--- a/source/gameengine/VideoTexture/BlendType.h
+++ b/source/gameengine/VideoTexture/BlendType.h
@@ -25,6 +25,7 @@ http://www.gnu.org/copyleft/lesser.txt.
/// class allows check type of blender python object and access its contained object
+/// MUST ONLY BE USED FOR KX classes that are descendent of PyObjectPlus
template <class PyObj> class BlendType
{
public:
@@ -48,8 +49,9 @@ public:
// if pointer to type is set and don't match to type of provided object, return NULL
else if (obj->ob_type != m_objType)
return NULL;
- // return pointer to object
- return (PyObj*)obj;
+ // return pointer to object, this class can only be used for KX object =>
+ // the Py object is actually a proxy
+ return (PyObj*)BGE_PROXY_REF(obj);
}
/// parse arguments to get object