godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #47674 from madmiraal/fix-47437

Browse Source 
Check for the use of an empty shape in Bullet Kinematic collisions
This commit is contained in:
Rémi Verschelde 2021-04-06 22:34:17 +02:00 committed by GitHub
commit 0d37116aee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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
View File

@ -1235,6 +1235,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;