diff options
| author | AndreaCatania <info@andreacatania.com> | 2017-12-23 00:04:53 +0100 |
|---|---|---|
| committer | AndreaCatania <info@andreacatania.com> | 2017-12-23 00:04:53 +0100 |
| commit | 512c60f1d8cee4a66cc75b80af4be1902b52e54c (patch) | |
| tree | c1b6be37ba9b00e93b278e75525c136d419c789a /modules | |
| parent | 8d13753e9171e2f525d7778b24a911bf60346aa2 (diff) | |
Fixed intersect_shape crash, closes #13697
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/bullet/godot_result_callbacks.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/bullet/godot_result_callbacks.cpp b/modules/bullet/godot_result_callbacks.cpp index cbf30c8a2e..37e45cfff8 100644 --- a/modules/bullet/godot_result_callbacks.cpp +++ b/modules/bullet/godot_result_callbacks.cpp @@ -142,6 +142,9 @@ bool GodotAllContactResultCallback::needsCollision(btBroadphaseProxy *proxy0) co btScalar GodotAllContactResultCallback::addSingleResult(btManifoldPoint &cp, const btCollisionObjectWrapper *colObj0Wrap, int partId0, int index0, const btCollisionObjectWrapper *colObj1Wrap, int partId1, int index1) { + if (m_count >= m_resultMax) + return cp.getDistance(); + if (cp.getDistance() <= 0) { PhysicsDirectSpaceState::ShapeResult &result = m_results[m_count]; @@ -165,7 +168,7 @@ btScalar GodotAllContactResultCallback::addSingleResult(btManifoldPoint &cp, con ++m_count; } - return m_count < m_resultMax; + return cp.getDistance(); } bool GodotContactPairContactResultCallback::needsCollision(btBroadphaseProxy *proxy0) const { |