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_SumoPhysicsController.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_SumoPhysicsController.cpp')
-rw-r--r-- | source/gameengine/Ketsji/KX_SumoPhysicsController.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/KX_SumoPhysicsController.cpp b/source/gameengine/Ketsji/KX_SumoPhysicsController.cpp index d042a302eda..6ea5461dbaa 100644 --- a/source/gameengine/Ketsji/KX_SumoPhysicsController.cpp +++ b/source/gameengine/Ketsji/KX_SumoPhysicsController.cpp @@ -164,7 +164,7 @@ gameobj->SetPhysicsController(this,gameobj->IsDynamic()); GetSumoObject()->setClientObject(gameobj->getClientInfo()); } -void KX_SumoPhysicsController::SetMargin(float collisionMargin) +void KX_SumoPhysicsController::setMargin(float collisionMargin) { SumoPhysicsController::SetMargin(collisionMargin); } |