diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-12-17 13:51:12 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-12-18 13:41:11 +0100 |
| commit | 3cbf8bde8455f98f9b447237ebfe578aca397574 (patch) | |
| tree | 175f1f5daee4928a8f78d4d5853d7da99902e940 /thirdparty/bullet/BulletCollision/NarrowPhaseCollision | |
| parent | 214a22b98e5d74a9b49346d5021641db6a9899cf (diff) | |
bullet: Sync with upstream 3.07
Diffstat (limited to 'thirdparty/bullet/BulletCollision/NarrowPhaseCollision')
| -rw-r--r-- | thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp index 45d1817135..7d53f8624a 100644 --- a/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp +++ b/thirdparty/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp @@ -1049,7 +1049,8 @@ btScalar btGjkEpaSolver2::SignedDistance(const btVector3& position, const btScalar length = delta.length(); results.normal = delta / length; results.witnesses[0] += results.normal * margin; - return (length - margin); + results.distance = length - margin; + return results.distance; } else { |