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_BulletPhysicsController.h | |
| 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_BulletPhysicsController.h')
| -rw-r--r-- | source/gameengine/Ketsji/KX_BulletPhysicsController.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/KX_BulletPhysicsController.h b/source/gameengine/Ketsji/KX_BulletPhysicsController.h index 272868459d0..619ac42503f 100644 --- a/source/gameengine/Ketsji/KX_BulletPhysicsController.h +++ b/source/gameengine/Ketsji/KX_BulletPhysicsController.h @@ -19,7 +19,7 @@ public: virtual void applyImpulse(const MT_Point3& attach, const MT_Vector3& impulse); virtual void SetObject (SG_IObject* object); - virtual void SetMargin (float collisionMargin); + virtual void setMargin (float collisionMargin); virtual void RelativeTranslate(const MT_Vector3& dloc,bool local); virtual void RelativeRotate(const MT_Matrix3x3& drot,bool local); virtual void ApplyTorque(const MT_Vector3& torque,bool local); |