aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorm4nu3lf2017-02-03 21:23:23 +0000
committerRémi Verschelde2017-03-18 19:58:23 +0100
commitca2277f3f1e6a7bd49597d4f498585dd5dcc5da2 (patch)
tree0b686db8d718a3cddb0609a4cff8f063d67e3c27
parent31260bb7202fdd59084a4d820b401c93dfaea156 (diff)
downloadgodot-ca2277f3f1e6a7bd49597d4f498585dd5dcc5da2.tar.gz
godot-ca2277f3f1e6a7bd49597d4f498585dd5dcc5da2.tar.zst
godot-ca2277f3f1e6a7bd49597d4f498585dd5dcc5da2.zip
Fixed property setter in G6DOF joint
(cherry picked from commit 0d9b53ce5e764715f5686f403664177e977e3573)
-rw-r--r--servers/physics/joints/generic_6dof_joint_sw.cpp2
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 4e25bebe5..cd643a853 100644
--- a/servers/physics/joints/generic_6dof_joint_sw.cpp
+++ b/servers/physics/joints/generic_6dof_joint_sw.cpp
@@ -675,7 +675,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;
}