diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-06-11 13:55:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-11 13:55:44 +0200 |
| commit | c499f1475f1c37c6d83985320a9e98a3d2711a2b (patch) | |
| tree | 8ceaa6bc1d5deb40b7c5fc998041ecd63ad122d9 /thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h | |
| parent | f0bacf360dbb6ce3781356438b2fa7067250d27c (diff) | |
| parent | 99acec63f175fecd7172c927263ed3787cb082d6 (diff) | |
Merge pull request #29418 from AndreaCatania/upbul
Updated Bullet version to the actual bullet master commit
Diffstat (limited to 'thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h')
| -rw-r--r-- | thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h index 2b2dfabec2..2d0df718a2 100644 --- a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h +++ b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h @@ -37,6 +37,7 @@ public: ///SubSimplexConvexCastRaytest is the default, even if kF_None is set. kF_UseSubSimplexConvexCastRaytest = 1 << 2, // Uses an approximate but faster ray versus convex intersection algorithm kF_UseGjkConvexCastRaytest = 1 << 3, + kF_DisableHeightfieldAccelerator = 1 << 4, //don't use the heightfield raycast accelerator. See https://github.com/bulletphysics/bullet3/pull/2062 kF_Terminator = 0xFFFFFFFF }; unsigned int m_flags; |