diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-12-03 13:28:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-03 13:28:48 +0100 |
| commit | 5861bac21e8a0846587b57c13c3c63cd4f9d148a (patch) | |
| tree | 97d56ccac7d20b34898cf638ccd6e3f6dc8848fe /modules/bullet | |
| parent | df53bf63971f8e7fde746180b2ee605373b3cafe (diff) | |
| parent | faca8b77aa045a276f4ecdab1c0049755a1351ca (diff) | |
Merge pull request #43801 from nekomatata/bullet-ccd-disabled
Fix ccd enabled by default on Bullet bodies
Diffstat (limited to 'modules/bullet')
| -rw-r--r-- | modules/bullet/rigid_body_bullet.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/bullet/rigid_body_bullet.cpp b/modules/bullet/rigid_body_bullet.cpp index eb599df74c..0c64c3640f 100644 --- a/modules/bullet/rigid_body_bullet.cpp +++ b/modules/bullet/rigid_body_bullet.cpp @@ -744,7 +744,7 @@ void RigidBodyBullet::set_continuous_collision_detection(bool p_enable) { } btBody->setCcdSweptSphereRadius(radius * 0.2); } else { - btBody->setCcdMotionThreshold(10000.0); + btBody->setCcdMotionThreshold(0.); btBody->setCcdSweptSphereRadius(0.); } } @@ -824,7 +824,7 @@ void RigidBodyBullet::reload_shapes() { btBody->updateInertiaTensor(); reload_kinematic_shapes(); - set_continuous_collision_detection(btBody->getCcdMotionThreshold() < 9998.0); + set_continuous_collision_detection(is_continuous_collision_detection_enabled()); reload_body(); } |