diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-04-06 22:34:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-06 22:34:17 +0200 |
| commit | 0d37116aeea6877054492300b82e9fd82aeee547 (patch) | |
| tree | 29f97393d8925b5c02f7149a1d35b939859b793c | |
| parent | 0485a0d8b2585da6fc22d7d72ac6f2ae6c18778a (diff) | |
| parent | ff9a6c4e39b53269f7c6274994dee4f1bff29dbd (diff) | |
Merge pull request #47674 from madmiraal/fix-47437
Check for the use of an empty shape in Bullet Kinematic collisions
| -rw-r--r-- | modules/bullet/space_bullet.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/bullet/space_bullet.cpp b/modules/bullet/space_bullet.cpp index ceae3be8bc..bdaec4a09e 100644 --- a/modules/bullet/space_bullet.cpp +++ b/modules/bullet/space_bullet.cpp @@ -1235,6 +1235,10 @@ bool SpaceBullet::recover_from_penetration(RigidBodyBullet *p_body, const btTran continue; } + if (kin_shape.shape->getShapeType() == EMPTY_SHAPE_PROXYTYPE) { + continue; + } + btTransform shape_transform = p_body_position * kin_shape.transform; shape_transform.getOrigin() += r_delta_recover_movement; |