diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-02-07 14:19:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-07 14:19:05 +0100 |
| commit | a73d46caa607a0de354ab3d7489dec64e070e4c5 (patch) | |
| tree | bccc922f50f936d59133e0ae9b8a770b205f08b9 /servers | |
| parent | bd8df0f21dfa0d9c68d14107bcb4f4b2cc4e099d (diff) | |
| parent | 0d9b53ce5e764715f5686f403664177e977e3573 (diff) | |
Merge pull request #7715 from m4nu3lf/bugfix/g6dof_joint_setter
Fixed property setter in G6DOF joint
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/physics/joints/generic_6dof_joint_sw.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/physics/joints/generic_6dof_joint_sw.cpp b/servers/physics/joints/generic_6dof_joint_sw.cpp index 48f70d9077..8d3fc4721a 100644 --- a/servers/physics/joints/generic_6dof_joint_sw.cpp +++ b/servers/physics/joints/generic_6dof_joint_sw.cpp @@ -676,7 +676,7 @@ float Generic6DOFJointSW::get_param(Vector3::Axis p_axis,PhysicsServer::G6DOFJoi } break; case PhysicsServer::G6DOF_JOINT_ANGULAR_MOTOR_FORCE_LIMIT: { - return m_angularLimits[p_axis].m_maxLimitForce; + return m_angularLimits[p_axis].m_maxMotorForce; } break; } |