diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2019-10-12 14:06:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-12 14:06:46 +0200 |
commit | 5d63cf161039b43c76ec70c57f27ae3cbf2e670a (patch) | |
tree | bd5f33c7c043b4b884bf7aec9a68936308eea920 | |
parent | 3ca1296b8c12ca52d7fc76ea9f853e8a3c8867d3 (diff) | |
parent | 42a9ae7a82839fa4f69281f247a26091b612aa8e (diff) |
Merge pull request #32767 from madmiraal/body2d-can_sleep-default
Fix mismatch between RigidBody2D and Body2DSW can_sleep defaults.
-rw-r--r-- | servers/physics/body_sw.cpp | 2 | ||||
-rw-r--r-- | servers/physics_2d/body_2d_sw.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/servers/physics/body_sw.cpp b/servers/physics/body_sw.cpp index a3bb581cb5..7d575c57ae 100644 --- a/servers/physics/body_sw.cpp +++ b/servers/physics/body_sw.cpp @@ -794,7 +794,7 @@ BodySW::BodySW() : still_time = 0; continuous_cd = false; - can_sleep = false; + can_sleep = true; fi_callback = NULL; } diff --git a/servers/physics_2d/body_2d_sw.cpp b/servers/physics_2d/body_2d_sw.cpp index 6ba159ca0a..f9939e3843 100644 --- a/servers/physics_2d/body_2d_sw.cpp +++ b/servers/physics_2d/body_2d_sw.cpp @@ -694,7 +694,7 @@ Body2DSW::Body2DSW() : still_time = 0; continuous_cd_mode = Physics2DServer::CCD_MODE_DISABLED; - can_sleep = false; + can_sleep = true; fi_callback = NULL; } |