diff options
| author | Hein-Pieter van Braam <hp@tmm.cx> | 2019-04-23 06:03:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-23 06:03:27 +0300 |
| commit | 7ba772d4ba782925472e35ba371678fa01e1ee79 (patch) | |
| tree | 358e8b8662f57e6eac67c54ad4fcfdb6a3b2928e | |
| parent | 4068e79a3214ac84a27f1e8c0d56a3e53a156fc6 (diff) | |
| parent | 0877cf64192c60e2c7a47250a8a44a4d70d8ff54 (diff) | |
Merge pull request #27730 from ShyRed/fix3dphyscansleep
Fix missing re-activation of bullet physics sleep feature
| -rw-r--r-- | modules/bullet/rigid_body_bullet.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/bullet/rigid_body_bullet.cpp b/modules/bullet/rigid_body_bullet.cpp index 22f2214898..e5f70a0b34 100644 --- a/modules/bullet/rigid_body_bullet.cpp +++ b/modules/bullet/rigid_body_bullet.cpp @@ -597,6 +597,8 @@ void RigidBodyBullet::set_state(PhysicsServer::BodyState p_state, const Variant if (!can_sleep) { // Can't sleep btBody->forceActivationState(DISABLE_DEACTIVATION); + } else { + btBody->forceActivationState(ACTIVE_TAG); } break; } |