diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-08-27 10:10:40 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2018-08-27 10:10:40 +0200 |
| commit | ddfef86836be8e30709006ac30bc83007823468c (patch) | |
| tree | 2ad0d83a740fa93bb228deacd8b562bd469d4345 /modules/bullet/generic_6dof_joint_bullet.cpp | |
| parent | 3c0ea513de684a07916190c636414bb2f5b53348 (diff) | |
| download | redot-engine-ddfef86836be8e30709006ac30bc83007823468c.tar.gz | |
Fix build after c2a9cb34
`return` statements were missing, and those warnings do not need to be
behind #ifdefs, they do not expose any deprecated API.
Diffstat (limited to 'modules/bullet/generic_6dof_joint_bullet.cpp')
| -rw-r--r-- | modules/bullet/generic_6dof_joint_bullet.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/modules/bullet/generic_6dof_joint_bullet.cpp b/modules/bullet/generic_6dof_joint_bullet.cpp index 123b5d717e..a36f1123bc 100644 --- a/modules/bullet/generic_6dof_joint_bullet.cpp +++ b/modules/bullet/generic_6dof_joint_bullet.cpp @@ -152,11 +152,10 @@ void Generic6DOFJointBullet::set_param(Vector3::Axis p_axis, PhysicsServer::G6DO case PhysicsServer::G6DOF_JOINT_ANGULAR_MOTOR_FORCE_LIMIT: sixDOFConstraint->getRotationalLimitMotor(p_axis)->m_maxMotorForce = p_value; break; -#ifndef DISABLE_DEPRECATED default: ERR_EXPLAIN("This parameter " + itos(p_param) + " is deprecated"); WARN_DEPRECATED -#endif // DISABLE_DEPRECATED + break; } } @@ -183,12 +182,10 @@ real_t Generic6DOFJointBullet::get_param(Vector3::Axis p_axis, PhysicsServer::G6 return sixDOFConstraint->getRotationalLimitMotor(p_axis)->m_targetVelocity; case PhysicsServer::G6DOF_JOINT_ANGULAR_MOTOR_FORCE_LIMIT: return sixDOFConstraint->getRotationalLimitMotor(p_axis)->m_maxMotorForce; -#ifndef DISABLE_DEPRECATED default: ERR_EXPLAIN("This parameter " + itos(p_param) + " is deprecated"); WARN_DEPRECATED; return 0; -#endif // DISABLE_DEPRECATED } } @@ -218,11 +215,10 @@ void Generic6DOFJointBullet::set_flag(Vector3::Axis p_axis, PhysicsServer::G6DOF case PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_LINEAR_MOTOR: sixDOFConstraint->getTranslationalLimitMotor()->m_enableMotor[p_axis] = flags[p_axis][p_flag]; break; -#ifndef DISABLE_DEPRECATED default: ERR_EXPLAIN("This flag " + itos(p_flag) + " is deprecated"); WARN_DEPRECATED -#endif // DISABLE_DEPRECATED + break; } } |