diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-01-08 21:17:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-08 21:17:33 +0100 |
| commit | b9a553f99de109427fc8ac62f7f3de0ec708a1b8 (patch) | |
| tree | 9c34bff6630785389209ed8d87fb05cf392024c8 /thirdparty/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp | |
| parent | 39b1ea50181d84c6fdfcd219a390deb4d522f603 (diff) | |
| parent | 29e07dfa4e42b871ee30e398b1c35d1aea68cd57 (diff) | |
Merge pull request #34921 from akien-mga/bullet-2.89
bullet: Sync with upstream 2.89
Diffstat (limited to 'thirdparty/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp')
| -rw-r--r-- | thirdparty/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/thirdparty/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp b/thirdparty/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp index 44dd3c553e..b48d97f2b2 100644 --- a/thirdparty/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp +++ b/thirdparty/bullet/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp @@ -503,9 +503,9 @@ void btConvexConvexAlgorithm ::processCollision(const btCollisionObjectWrapper* gjkPairDetector.getClosestPoints(input, withoutMargin, dispatchInfo.m_debugDraw); //gjkPairDetector.getClosestPoints(input,dummy,dispatchInfo.m_debugDraw); -#endif //ZERO_MARGIN \ - //btScalar l2 = gjkPairDetector.getCachedSeparatingAxis().length2(); \ - //if (l2>SIMD_EPSILON) +#endif //ZERO_MARGIN + //btScalar l2 = gjkPairDetector.getCachedSeparatingAxis().length2(); + //if (l2>SIMD_EPSILON) { sepNormalWorldSpace = withoutMargin.m_reportedNormalOnWorld; //gjkPairDetector.getCachedSeparatingAxis()*(1.f/l2); //minDist = -1e30f;//gjkPairDetector.getCachedSeparatingDistance(); |