godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 12:50:35 +00:00
Code Releases Wiki Activity

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

Browse Source 
(cherry picked from commit ff9a6c4e39)
This commit is contained in:
Marcel Admiraal
2021-04-06 18:33:30 +01:00
committed by Rémi Verschelde
parent a3f4bd96c5
commit 1e28e234c5
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/bullet/space_bullet.cpp
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;