diff options
author | Diego Borghetti <bdiego@gmail.com> | 2008-08-14 10:09:57 +0400 |
---|---|---|
committer | Diego Borghetti <bdiego@gmail.com> | 2008-08-14 10:09:57 +0400 |
commit | c1a9527804b37915476eff39724c10027db3eb5c (patch) | |
tree | c6387b3552578986939e6769b9bd4fb6a17571f3 /source/gameengine | |
parent | b5cd4739d8aa9256eed6a8b6c057fc0e2b73b2d1 (diff) |
branches/blender-2.47
Merge from trunk:
Revision: 16100
Diffstat (limited to 'source/gameengine')
-rw-r--r-- | source/gameengine/Ketsji/KX_GameObject.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/KX_MeshProxy.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index 02d1ad1b12b..d1459b02377 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -941,7 +941,7 @@ PyObject* KX_GameObject::PyEndObject(PyObject* self) KX_Scene *scene = PHY_GetActiveScene(); scene->DelayedRemoveObject(this); - return Py_None; + Py_RETURN_NONE; } diff --git a/source/gameengine/Ketsji/KX_MeshProxy.cpp b/source/gameengine/Ketsji/KX_MeshProxy.cpp index c7a251751cd..a0ac9cfd4ff 100644 --- a/source/gameengine/Ketsji/KX_MeshProxy.cpp +++ b/source/gameengine/Ketsji/KX_MeshProxy.cpp @@ -238,5 +238,5 @@ KX_PYMETHODDEF_DOC(KX_MeshProxy, reinstancePhysicsMesh, "Reinstance the physics mesh.") { //this needs to be reviewed, it is dependend on Sumo/Solid. Who is using this ? - return Py_None;//Py_Success(KX_ReInstanceShapeFromMesh(m_meshobj)); + Py_RETURN_NONE;//(KX_ReInstanceShapeFromMesh(m_meshobj)) ? Py_RETURN_TRUE : Py_RETURN_FALSE; } |