diff --git a/examples/SharedMemory/BodyJointInfoUtility.h b/examples/SharedMemory/BodyJointInfoUtility.h index 6c3e61c16..decced5ba 100644 --- a/examples/SharedMemory/BodyJointInfoUtility.h +++ b/examples/SharedMemory/BodyJointInfoUtility.h @@ -60,7 +60,7 @@ template void addJointInfoFromMultiBodyData(const T* mb info.m_jointType = mb->m_links[link].m_jointType; info.m_jointDamping = mb->m_links[link].m_jointDamping; - info.m_jointFriction1 = mb->m_links[link].m_jointFriction; + info.m_jointFriction = mb->m_links[link].m_jointFriction; info.m_jointLowerLimit = mb->m_links[link].m_jointLowerLimit; info.m_jointUpperLimit = mb->m_links[link].m_jointUpperLimit; info.m_jointMaxForce = mb->m_links[link].m_jointMaxForce; @@ -80,4 +80,4 @@ template void addJointInfoFromMultiBodyData(const T* mb -#endif //BODY_JOINT_INFO_UTILITY_H \ No newline at end of file +#endif //BODY_JOINT_INFO_UTILITY_H diff --git a/examples/SharedMemory/SharedMemoryPublic.h b/examples/SharedMemory/SharedMemoryPublic.h index 6587747d4..8f4ae3d37 100644 --- a/examples/SharedMemory/SharedMemoryPublic.h +++ b/examples/SharedMemory/SharedMemoryPublic.h @@ -174,7 +174,7 @@ struct b3JointInfo int m_jointIndex; int m_flags; double m_jointDamping; - double m_jointFriction1; + double m_jointFriction; double m_jointLowerLimit; double m_jointUpperLimit; double m_jointMaxForce; diff --git a/examples/pybullet/pybullet.c b/examples/pybullet/pybullet.c index ddf444d6e..7bb01cca1 100644 --- a/examples/pybullet/pybullet.c +++ b/examples/pybullet/pybullet.c @@ -2118,7 +2118,7 @@ static PyObject* pybullet_getJointInfo(PyObject* self, PyObject* args, PyObject* PyTuple_SetItem(pyListJointInfo, 6, PyFloat_FromDouble(info.m_jointDamping)); PyTuple_SetItem(pyListJointInfo, 7, - PyFloat_FromDouble(info.m_jointFriction1)); + PyFloat_FromDouble(info.m_jointFriction)); PyTuple_SetItem(pyListJointInfo, 8, PyFloat_FromDouble(info.m_jointLowerLimit)); PyTuple_SetItem(pyListJointInfo, 9,