From 7e56ef1484468f912582cf3fcb6704053378789f Mon Sep 17 00:00:00 2001 From: Marcel Admiraal Date: Sat, 12 Oct 2019 08:02:03 +0200 Subject: [PATCH] Fix mismatch between RigidBody(2D) and Body(2D)SW can_sleep defaults. - Set Body2DSW can_sleep default to true. - Set Body2D can_sleep default to true. (cherry picked from commit 42a9ae7a82839fa4f69281f247a26091b612aa8e) --- servers/physics/body_sw.cpp | 2 +- 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 f0fbbafe1c9..a60f548d34f 100644 --- a/servers/physics/body_sw.cpp +++ b/servers/physics/body_sw.cpp @@ -791,7 +791,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 60bcb2e28e0..a103688deaa 100644 --- a/servers/physics_2d/body_2d_sw.cpp +++ b/servers/physics_2d/body_2d_sw.cpp @@ -687,7 +687,7 @@ Body2DSW::Body2DSW() : still_time = 0; continuous_cd_mode = Physics2DServer::CCD_MODE_DISABLED; - can_sleep = false; + can_sleep = true; fi_callback = NULL; }