Merge pull request #1371 from jonathantompson/userConstraintResultArgs_fix

Fixed setting of m_userConstraintResultArgs.
This commit is contained in:
erwincoumans 2017-10-08 22:56:56 -07:00 committed by GitHub
commit 7d7f5ee7d4

View File

@ -7209,6 +7209,7 @@ bool PhysicsServerCommandProcessor::processCommand(const struct SharedMemoryComm
InteralUserConstraintData userConstraintData;
userConstraintData.m_mbConstraint = multibodyGear;
int uid = m_data->m_userConstraintUIDGenerator++;
serverCmd.m_userConstraintResultArgs = clientCmd.m_userConstraintArguments;
serverCmd.m_userConstraintResultArgs.m_userConstraintUniqueId = uid;
serverCmd.m_userConstraintResultArgs.m_maxAppliedForce = defaultMaxForce;
userConstraintData.m_userConstraintData = serverCmd.m_userConstraintResultArgs;
@ -7230,6 +7231,7 @@ bool PhysicsServerCommandProcessor::processCommand(const struct SharedMemoryComm
InteralUserConstraintData userConstraintData;
userConstraintData.m_mbConstraint = multibodyFixed;
int uid = m_data->m_userConstraintUIDGenerator++;
serverCmd.m_userConstraintResultArgs = clientCmd.m_userConstraintArguments;
serverCmd.m_userConstraintResultArgs.m_userConstraintUniqueId = uid;
serverCmd.m_userConstraintResultArgs.m_maxAppliedForce = defaultMaxForce;
userConstraintData.m_userConstraintData = serverCmd.m_userConstraintResultArgs;