summaryrefslogtreecommitdiff
path: root/modules/bullet/cone_twist_joint_bullet.cpp
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2018-08-27 07:46:40 +0200
committerGitHub <noreply@github.com>2018-08-27 07:46:40 +0200
commit98cc2ce1dd62947e240f61d61b995328b73fca6a (patch)
tree49a8aa1bdeac869ea8f0aa5f60266d5cd4644e39 /modules/bullet/cone_twist_joint_bullet.cpp
parentdb55d8a4b6ad6c14f2131e02b50689eb8380276f (diff)
parent76d02b13a18d477dcf21aa3a0e5664fc0e609ba3 (diff)
Merge pull request #21433 from AndreaCatania/megafix
Multiple fixes on Physics things
Diffstat (limited to 'modules/bullet/cone_twist_joint_bullet.cpp')
-rw-r--r--modules/bullet/cone_twist_joint_bullet.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/modules/bullet/cone_twist_joint_bullet.cpp b/modules/bullet/cone_twist_joint_bullet.cpp
index 6b5438c60f..9346f2d336 100644
--- a/modules/bullet/cone_twist_joint_bullet.cpp
+++ b/modules/bullet/cone_twist_joint_bullet.cpp
@@ -82,8 +82,11 @@ void ConeTwistJointBullet::set_param(PhysicsServer::ConeTwistJointParam p_param,
case PhysicsServer::CONE_TWIST_JOINT_RELAXATION:
coneConstraint->setLimit(coneConstraint->getSwingSpan1(), coneConstraint->getSwingSpan2(), coneConstraint->getTwistSpan(), coneConstraint->getLimitSoftness(), coneConstraint->getBiasFactor(), p_value);
break;
+#ifndef DISABLE_DEPRECATED
default:
- WARN_PRINT("This parameter is not supported by Bullet engine");
+ ERR_EXPLAIN("This parameter " + itos(p_param) + " is deprecated");
+ WARN_DEPRECATED
+#endif // DISABLE_DEPRECATED
}
}
@@ -99,8 +102,11 @@ real_t ConeTwistJointBullet::get_param(PhysicsServer::ConeTwistJointParam p_para
return coneConstraint->getLimitSoftness();
case PhysicsServer::CONE_TWIST_JOINT_RELAXATION:
return coneConstraint->getRelaxationFactor();
+#ifndef DISABLE_DEPRECATED
default:
- WARN_PRINT("This parameter is not supported by Bullet engine");
+ ERR_EXPLAIN("This parameter " + itos(p_param) + " is deprecated");
+ WARN_DEPRECATED;
return 0;
+#endif // DISABLE_DEPRECATED
}
}