diff options
| author | Marcel Admiraal <madmiraal@users.noreply.github.com> | 2021-04-06 18:33:30 +0100 |
|---|---|---|
| committer | Marcel Admiraal <madmiraal@users.noreply.github.com> | 2021-04-06 18:40:13 +0100 |
| commit | ff9a6c4e39b53269f7c6274994dee4f1bff29dbd (patch) | |
| tree | 810670a7e62e27e934f39ab6d75fdff30deb5414 /modules | |
| parent | 55faf1c874fae5b67928395d3a35889bbb4e458b (diff) | |
Check for the use of an empty shape in Bullet Kinematic collisions
Diffstat (limited to 'modules')
| -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; |