Gremlinsoft
/
godot
forked from sascha/godot
2
0
Fork 0
Code Pull Requests Activity

Check for the use of an empty shape in Bullet Kinematic collisions 

(cherry picked from commit ff9a6c4e39)
3.3
Marcel Admiraal 2021-04-06 18:33:30 +07:00 committed by Rémi Verschelde
parent a3f4bd96c5
commit 1e28e234c5
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/bullet/space_bullet.cpp
Unescape Escape View File

@ -1273,6 +1273,10 @@ bool SpaceBullet::recover_from_penetration(RigidBodyBullet *p_body, const btTran
continue; continue;
} }
if (kin_shape.shape->getShapeType() == EMPTY_SHAPE_PROXYTYPE) {
continue;
}
btTransform shape_transform = p_body_position * kin_shape.transform; btTransform shape_transform = p_body_position * kin_shape.transform;
shape_transform.getOrigin() += r_delta_recover_movement; shape_transform.getOrigin() += r_delta_recover_movement;