diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-04-14 12:53:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-14 12:53:20 +0200 |
| commit | e0eb9a8ae474ad8ed2a155b176e0c1b14cf66773 (patch) | |
| tree | e3a3c391c52643086dce9959644fcbf4435a7f75 /servers | |
| parent | 3afa3db0962d894ee3bb347736e71d284fc6e608 (diff) | |
| parent | 30b184cb0619dca37f7c779328138bf3d403660e (diff) | |
Merge pull request #37826 from nekomatata/direct-body-state-sleep
Fix set_sleep_state in Bullet body direct state
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/physics_3d/body_3d_sw.h | 2 | ||||
| -rw-r--r-- | servers/physics_server_3d.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/servers/physics_3d/body_3d_sw.h b/servers/physics_3d/body_3d_sw.h index a6b18ee33c..2bd335e6c0 100644 --- a/servers/physics_3d/body_3d_sw.h +++ b/servers/physics_3d/body_3d_sw.h @@ -421,7 +421,7 @@ public: virtual void apply_impulse(const Vector3 &p_pos, const Vector3 &p_j) { body->apply_impulse(p_pos, p_j); } virtual void apply_torque_impulse(const Vector3 &p_j) { body->apply_torque_impulse(p_j); } - virtual void set_sleep_state(bool p_enable) { body->set_active(!p_enable); } + virtual void set_sleep_state(bool p_sleep) { body->set_active(!p_sleep); } virtual bool is_sleeping() const { return !body->is_active(); } virtual int get_contact_count() const { return body->contact_count; } diff --git a/servers/physics_server_3d.h b/servers/physics_server_3d.h index a2f08b3ed8..8ea8b22455 100644 --- a/servers/physics_server_3d.h +++ b/servers/physics_server_3d.h @@ -70,7 +70,7 @@ public: virtual void apply_impulse(const Vector3 &p_pos, const Vector3 &p_j) = 0; virtual void apply_torque_impulse(const Vector3 &p_j) = 0; - virtual void set_sleep_state(bool p_enable) = 0; + virtual void set_sleep_state(bool p_sleep) = 0; virtual bool is_sleeping() const = 0; virtual int get_contact_count() const = 0; |