godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing check for 2d physics bounce and friction setters 

The override check was already present for 3d physics but missing for 2d
This commit is contained in:
Kanabenki 2019-03-18 15:30:26 +01:00
parent df7d3708c5
commit 3f64215a43
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/2d/physics_body_2d.cpp
View File

@ -199,7 +199,7 @@ real_t StaticBody2D::get_constant_angular_velocity() const {
#ifndef DISABLE_DEPRECATED #ifndef DISABLE_DEPRECATED
void StaticBody2D::set_friction(real_t p_friction) { void StaticBody2D::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;
} }
@ -229,7 +229,7 @@ real_t StaticBody2D::get_friction() const {
void StaticBody2D::set_bounce(real_t p_bounce) { void StaticBody2D::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;
} }
@ -626,7 +626,7 @@ real_t RigidBody2D::get_weight() const {
#ifndef DISABLE_DEPRECATED #ifndef DISABLE_DEPRECATED
void RigidBody2D::set_friction(real_t p_friction) { void RigidBody2D::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;
} }
@ -655,7 +655,7 @@ real_t RigidBody2D::get_friction() const {
void RigidBody2D::set_bounce(real_t p_bounce) { void RigidBody2D::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;
} }