Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErwin Coumans <blender@erwincoumans.com>2006-11-21 03:53:40 +0300
committerErwin Coumans <blender@erwincoumans.com>2006-11-21 03:53:40 +0300
commit46234f90cee9b3967cb6361661ce47b455cbaa57 (patch)
tree8f32252f55c29694c1fa619d00a67ea4b4941099 /source/gameengine/Ketsji/KX_IPhysicsController.h
parent4bbbabd04957d6564d43b076e1e144f0bb4da439 (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_IPhysicsController.h')
-rw-r--r--source/gameengine/Ketsji/KX_IPhysicsController.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/KX_IPhysicsController.h b/source/gameengine/Ketsji/KX_IPhysicsController.h
index 9a64be7f99c..faf32bccbcd 100644
--- a/source/gameengine/Ketsji/KX_IPhysicsController.h
+++ b/source/gameengine/Ketsji/KX_IPhysicsController.h
@@ -60,7 +60,7 @@ public:
virtual void applyImpulse(const MT_Point3& attach, const MT_Vector3& impulse)=0;
virtual void SetObject (SG_IObject* object)=0;
- virtual void SetMargin (float collisionMargin)=0;
+ virtual void setMargin (float collisionMargin)=0;
virtual void RelativeTranslate(const MT_Vector3& dloc,bool local)=0;
virtual void RelativeRotate(const MT_Matrix3x3& drot,bool local)=0;