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.h
+++ b/examples/SharedMemory/PhysicsDirect.h
@@ -69,6 +69,8 @@ public:
    virtual int getNumUserConstraints() const;
    
    virtual int getUserConstraintInfo(int constraintUniqueId, struct b3UserConstraint& info) const;
+	
+	virtual int getUserConstraintId(int serialIndex) const;
    
 	///todo: move this out of the
    virtual void setSharedMemoryKey(int key);