diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2006-11-21 03:53:40 +0300 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2006-11-21 03:53:40 +0300 |
| commit | 46234f90cee9b3967cb6361661ce47b455cbaa57 (patch) | |
| tree | 8f32252f55c29694c1fa619d00a67ea4b4941099 /source/gameengine/Ketsji/KX_GameObject.cpp | |
| parent | 4bbbabd04957d6564d43b076e1e144f0bb4da439 (diff) | |
Removed old Blender/extern/bullet, and upgraded game engine to use Bullet 2.x
All platforms/build systems: either upgrade to use extern/bullet2, or disable the game engine until the build is fixed.
Diffstat (limited to 'source/gameengine/Ketsji/KX_GameObject.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_GameObject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index 6e53cb4d25f..dfd9af1a93f 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -992,7 +992,7 @@ PyObject* KX_GameObject::PySetCollisionMargin(PyObject* self, { if (m_pPhysicsController1) { - m_pPhysicsController1->SetMargin(collisionMargin); + m_pPhysicsController1->setMargin(collisionMargin); Py_Return; } |