diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-01-24 12:43:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-24 12:43:03 +0100 |
| commit | fb9c83780d9528e69ad15e653b9199f2b09a2eaf (patch) | |
| tree | f4e01ba82feaabe63571d78fccd1598adf838dea /scene/3d/physics_body.cpp | |
| parent | 7b4e7d56629638e73e30c4b39ca7494bda223960 (diff) | |
| parent | 63b487e49ccf6cce5e259f6d4d2fcb9c01158dc5 (diff) | |
Merge pull request #25282 from akien-mga/physicsbody-friction-default
Fix PhysicsBody ignoring deprecated set_friction/bounce with default value
Diffstat (limited to 'scene/3d/physics_body.cpp')
| -rw-r--r-- | scene/3d/physics_body.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scene/3d/physics_body.cpp b/scene/3d/physics_body.cpp index 22da51ac30..50abbd483a 100644 --- a/scene/3d/physics_body.cpp +++ b/scene/3d/physics_body.cpp @@ -188,7 +188,7 @@ PhysicsBody::PhysicsBody(PhysicsServer::BodyMode p_mode) : #ifndef DISABLE_DEPRECATED void StaticBody::set_friction(real_t p_friction) { - if (p_friction == 1.0) { // default value, don't create an override for that + if (p_friction == 1.0 && physics_material_override.is_null()) { // default value, don't create an override for that return; } @@ -218,7 +218,7 @@ real_t StaticBody::get_friction() const { void StaticBody::set_bounce(real_t p_bounce) { - if (p_bounce == 0.0) { // default value, don't create an override for that + if (p_bounce == 0.0 && physics_material_override.is_null()) { // default value, don't create an override for that return; } @@ -632,7 +632,7 @@ real_t RigidBody::get_weight() const { #ifndef DISABLE_DEPRECATED void RigidBody::set_friction(real_t p_friction) { - if (p_friction == 1.0) { // default value, don't create an override for that + if (p_friction == 1.0 && physics_material_override.is_null()) { // default value, don't create an override for that return; } @@ -661,7 +661,7 @@ real_t RigidBody::get_friction() const { void RigidBody::set_bounce(real_t p_bounce) { - if (p_bounce == 0.0) { // default value, don't create an override for that + if (p_bounce == 0.0 && physics_material_override.is_null()) { // default value, don't create an override for that return; } |