diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-11-20 08:16:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-20 08:16:26 +0100 |
| commit | 9170abc17f202c2d95c8db84a323cf03ceb5f596 (patch) | |
| tree | 3a77bf447017623e2389766951ac17e1148971e6 /scene/3d | |
| parent | 296834955f95012dd2e1ce935f74ffb537ab6dfc (diff) | |
| parent | 397b4c2a4a06251aac3e9107e8b7ad5c33d96809 (diff) | |
Merge pull request #23835 from ibrahn/remove-dup-prop-6dof
Removed duplicate property bind in Generic6DOFJoint.
Diffstat (limited to 'scene/3d')
| -rw-r--r-- | scene/3d/physics_joint.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scene/3d/physics_joint.cpp b/scene/3d/physics_joint.cpp index 1adf1c5d79..02c6b1d969 100644 --- a/scene/3d/physics_joint.cpp +++ b/scene/3d/physics_joint.cpp @@ -776,7 +776,6 @@ void Generic6DOFJoint::_bind_methods() { ADD_PROPERTYI(PropertyInfo(Variant::REAL, "linear_motor_z/target_velocity"), "set_param_z", "get_param_z", PARAM_LINEAR_MOTOR_TARGET_VELOCITY); ADD_PROPERTYI(PropertyInfo(Variant::REAL, "linear_motor_z/force_limit"), "set_param_z", "get_param_z", PARAM_LINEAR_MOTOR_FORCE_LIMIT); ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "linear_spring_z/enabled"), "set_flag_z", "get_flag_z", FLAG_ENABLE_LINEAR_SPRING); - ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "linear_spring_z/enabled"), "set_flag_z", "get_flag_z", FLAG_ENABLE_LINEAR_SPRING); ADD_PROPERTYI(PropertyInfo(Variant::REAL, "linear_spring_z/stiffness"), "set_param_z", "get_param_z", PARAM_LINEAR_SPRING_STIFFNESS); ADD_PROPERTYI(PropertyInfo(Variant::REAL, "linear_spring_z/damping"), "set_param_z", "get_param_z", PARAM_LINEAR_SPRING_DAMPING); ADD_PROPERTYI(PropertyInfo(Variant::REAL, "linear_spring_z/equilibrium_point"), "set_param_z", "get_param_z", PARAM_LINEAR_SPRING_EQUILIBRIUM_POINT); |