asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #25282 from akien-mga/physicsbody-friction-default

Browse source 
Fix PhysicsBody ignoring deprecated set_friction/bounce with default value
This commit is contained in:
Rémi Verschelde 2019-01-24 12:43:03 +01:00 committed by GitHub
commit fb9c83780d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scene/3d/physics_body.cpp
View file

@ -188,7 +188,7 @@ PhysicsBody::PhysicsBody(PhysicsServer::BodyMode p_mode) :
#ifndef DISABLE_DEPRECATED #ifndef DISABLE_DEPRECATED
void StaticBody::set_friction(real_t p_friction) { 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; return;
} }
@ -218,7 +218,7 @@ real_t StaticBody::get_friction() const {
void StaticBody::set_bounce(real_t p_bounce) { 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; return;
} }
@ -632,7 +632,7 @@ real_t RigidBody::get_weight() const {
#ifndef DISABLE_DEPRECATED #ifndef DISABLE_DEPRECATED
void RigidBody::set_friction(real_t p_friction) { 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; return;
} }
@ -661,7 +661,7 @@ real_t RigidBody::get_friction() const {
void RigidBody::set_bounce(real_t p_bounce) { 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; return;
} }