diff options
author | Erwin Coumans <blender@erwincoumans.com> | 2009-03-03 17:31:10 +0300 |
---|---|---|
committer | Erwin Coumans <blender@erwincoumans.com> | 2009-03-03 17:31:10 +0300 |
commit | 151317e990a432879a6978087d8d9bad831d5981 (patch) | |
tree | 463663962a4fcb7c49bd70db577e3a71cea6fe95 /extern | |
parent | 982a5cc60dd93b21ce110b3fff831d05720047bf (diff) |
Fix build: don't use Character stuff, it wasn't meant to be included in Blender/extern/bullet2 distro.
Diffstat (limited to 'extern')
-rw-r--r-- | extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp b/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp index ba48f404929..ec803df06f7 100644 --- a/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp +++ b/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp @@ -56,8 +56,10 @@ subject to the following restrictions: #include "BulletDynamics/Vehicle/btRaycastVehicle.h" #include "BulletDynamics/Vehicle/btVehicleRaycaster.h" #include "BulletDynamics/Vehicle/btWheelInfo.h" +#ifdef USE_CHARACTER //character #include "BulletDynamics/Character/btCharacterControllerInterface.h" +#endif //USE_CHARACTER #include "LinearMath/btIDebugDraw.h" #include "LinearMath/btQuickprof.h" @@ -506,6 +508,7 @@ void btDiscreteDynamicsWorld::updateVehicles(btScalar timeStep) void btDiscreteDynamicsWorld::updateCharacters(btScalar timeStep) { +#ifdef USE_CHARACTER BT_PROFILE("updateCharacters"); for ( int i=0;i<m_characters.size();i++) @@ -514,6 +517,7 @@ void btDiscreteDynamicsWorld::updateCharacters(btScalar timeStep) character->preStep (this); character->playerStep (this,timeStep); } +#endif //USE_CHARACTER } @@ -584,12 +588,16 @@ void btDiscreteDynamicsWorld::removeVehicle(btRaycastVehicle* vehicle) void btDiscreteDynamicsWorld::addCharacter(btCharacterControllerInterface* character) { +#ifdef USE_CHARACTER m_characters.push_back(character); +#endif //USE_CHARACTER } void btDiscreteDynamicsWorld::removeCharacter(btCharacterControllerInterface* character) { +#ifdef USE_CHARACTER m_characters.remove(character); +#endif //USE_CHARACTER } |