diff options
| author | Camille Mohr-Daurat <pouleyKetchoup@gmail.com> | 2021-09-27 08:53:36 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-27 08:53:36 -0700 |
| commit | 27417c065d992cef48f28ff3c9eb9ac6c15138aa (patch) | |
| tree | 3936285f8e151cdc11e592d82dedba9774372f5a | |
| parent | 281d0bd59e1b8a8ee2032df97f28051d5668b5da (diff) | |
| parent | 3540e716f9e20fe57e94d55f19a789c3b9a31b28 (diff) | |
Merge pull request #53118 from BimDav/physicsbody_to_kinematic
Reload kinematic shapes when changing PhysicsBody mode to Kinematic
| -rw-r--r-- | modules/bullet/rigid_body_bullet.cpp | 1 | ||||
| -rw-r--r-- | modules/bullet/space_bullet.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/modules/bullet/rigid_body_bullet.cpp b/modules/bullet/rigid_body_bullet.cpp index 0d2cd1f5a0..b511c5f8d8 100644 --- a/modules/bullet/rigid_body_bullet.cpp +++ b/modules/bullet/rigid_body_bullet.cpp @@ -303,6 +303,7 @@ RigidBodyBullet::~RigidBodyBullet() { void RigidBodyBullet::init_kinematic_utilities() { kinematic_utilities = memnew(KinematicUtilities(this)); + reload_kinematic_shapes(); } void RigidBodyBullet::destroy_kinematic_utilities() { diff --git a/modules/bullet/space_bullet.cpp b/modules/bullet/space_bullet.cpp index a9a811c445..0cfd658bd5 100644 --- a/modules/bullet/space_bullet.cpp +++ b/modules/bullet/space_bullet.cpp @@ -947,7 +947,6 @@ bool SpaceBullet::test_body_motion(RigidBodyBullet *p_body, const Transform3D &p if (!p_body->get_kinematic_utilities()) { p_body->init_kinematic_utilities(); - p_body->reload_kinematic_shapes(); } btVector3 initial_recover_motion(0, 0, 0); @@ -1089,7 +1088,6 @@ int SpaceBullet::test_ray_separation(RigidBodyBullet *p_body, const Transform3D if (!p_body->get_kinematic_utilities()) { p_body->init_kinematic_utilities(); - p_body->reload_kinematic_shapes(); } btVector3 recover_motion(0, 0, 0); |