Merge remote-tracking branch 'upstream/master'

2017-02-03 12:32:08 -08:00
parent ac5a8aa2d6 c1eabcf059
commit 3442b6524a
10 changed files with 170 additions and 32 deletions
--- a/examples/SharedMemory/SharedMemoryPublic.h
+++ b/examples/SharedMemory/SharedMemoryPublic.h
@@ -189,6 +189,11 @@ struct b3BodyInfo
 };


+// copied from btMultiBodyLink.h
+enum SensorType {
+	eSensorForceTorqueType = 1,
+};
+

 struct b3JointSensorState
 {