diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2014-04-24 06:37:54 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2014-04-24 06:39:57 +0400 |
| commit | f5c3c624f8e62f266994be42fa4c85ce579321c0 (patch) | |
| tree | 1ecddb7f709c95840ffc5711f912e23d867306a3 /source/gameengine/Ketsji/KX_GameObject.cpp | |
| parent | 4e5e3a978e497dad315fec2e3690c977a06ca779 (diff) | |
BGE Cleanup: Moving reinstancing physics shapes from KX_ConvertPhysicsObject to PHY_IPhysicsController
This was the last item in KX_ConvertPhysicsObject. Therefore,
KX_ConvertPhysicsObject.h and KX_ConvertPhysicsObjects.cpp have been
removed.
Diffstat (limited to 'source/gameengine/Ketsji/KX_GameObject.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_GameObject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index ec64d09d147..bd8d68819ad 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -1908,11 +1908,11 @@ PyObject *KX_GameObject::PyReinstancePhysicsMesh(PyObject *args) ) { return NULL; } -#ifdef WITH_BULLET + /* gameobj and mesh can be NULL */ - if (KX_ReInstanceBulletShapeFromMesh(this, gameobj, mesh)) + if (GetPhysicsController() && GetPhysicsController()->ReinstancePhysicsShape(gameobj, mesh)) Py_RETURN_TRUE; -#endif + Py_RETURN_FALSE; } |