diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-01-07 15:08:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-07 15:08:41 +0100 |
| commit | dab650fcaa3eb37deee5118d678a3763ac78a58a (patch) | |
| tree | 3131df01280f91a61b4721eed132a5b6b21881ba /thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h | |
| parent | a3a537c2cf86ff4bf82385bbd17606654f8013c4 (diff) | |
| parent | 22b7c9dfa80d0f7abca40f061865c2ab3c136a74 (diff) | |
Merge pull request #24740 from OBKF/update-bullet-physics
Update Bullet physics to commit 126b676
Diffstat (limited to 'thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h')
| -rw-r--r-- | thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h b/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h index 62ee66c4e9..bd81284939 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h @@ -26,20 +26,18 @@ struct btCollisionAlgorithmConstructionInfo; struct btCollisionAlgorithmCreateFunc { bool m_swapped; - + btCollisionAlgorithmCreateFunc() - :m_swapped(false) + : m_swapped(false) { } virtual ~btCollisionAlgorithmCreateFunc(){}; - virtual btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& , const btCollisionObjectWrapper* body0Wrap,const btCollisionObjectWrapper* body1Wrap) + virtual btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo&, const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap) { - (void)body0Wrap; (void)body1Wrap; return 0; } }; -#endif //BT_COLLISION_CREATE_FUNC - +#endif //BT_COLLISION_CREATE_FUNC |