diff options
| author | Sebastian Parborg <darkdefende@gmail.com> | 2020-09-02 21:41:30 +0300 |
|---|---|---|
| committer | Sebastian Parborg <darkdefende@gmail.com> | 2020-09-02 21:41:30 +0300 |
| commit | 4446c3a593c51603e135e38951607b9b668ddec5 (patch) | |
| tree | 9552dbd903b4fd05ea740e1bba9b1b87d97414a1 /extern/bullet2/src/btBulletCollisionCommon.h | |
| parent | 6f6f6ee18695dad66ad8aa0eb2bcab72501df597 (diff) | |
Sync Bullet to upstream
This syncs Bullet to the latest upstream git version as of writing this.
(commit 47b0259b9700455022b5cf79b651cc1dc71dd59e).
Diffstat (limited to 'extern/bullet2/src/btBulletCollisionCommon.h')
| -rw-r--r-- | extern/bullet2/src/btBulletCollisionCommon.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/extern/bullet2/src/btBulletCollisionCommon.h b/extern/bullet2/src/btBulletCollisionCommon.h index af981b5d36d..4f523756a74 100644 --- a/extern/bullet2/src/btBulletCollisionCommon.h +++ b/extern/bullet2/src/btBulletCollisionCommon.h @@ -52,7 +52,6 @@ subject to the following restrictions: #include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h" #include "BulletCollision/BroadphaseCollision/btSimpleBroadphase.h" #include "BulletCollision/BroadphaseCollision/btAxisSweep3.h" -#include "BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h" #include "BulletCollision/BroadphaseCollision/btDbvtBroadphase.h" ///Math library & Utils @@ -63,6 +62,4 @@ subject to the following restrictions: #include "LinearMath/btIDebugDraw.h" #include "LinearMath/btSerializer.h" - -#endif //BULLET_COLLISION_COMMON_H - +#endif //BULLET_COLLISION_COMMON_H |