Merge remote-tracking branch 'bp/master'

2017-05-04 10:51:42 -07:00
parent 4602fbba34 87a24dba84
commit a7d08ca9d7
27 changed files with 707 additions and 10 deletions
--- a/examples/SharedMemory/PhysicsDirect.cpp
+++ b/examples/SharedMemory/PhysicsDirect.cpp
@@ -961,7 +961,14 @@ int PhysicsDirect::getUserConstraintInfo(int constraintUniqueId, struct b3UserCo
    return 0;
 }

-
+int PhysicsDirect::getUserConstraintId(int serialIndex) const
+{
+	if ((serialIndex >= 0) && (serialIndex < getNumUserConstraints()))
+	{
+		return m_data->m_userConstraintInfoMap.getKeyAtIndex(serialIndex).getUid1();
+	}
+	return -1;
+}

 int PhysicsDirect::getBodyUniqueId(int serialIndex) const
 {