Merge remote-tracking branch 'upstream/master'

2017-03-23 13:55:44 -07:00
parent d717b1db84 1aff189fdd
commit 0a552c3ba1
5 changed files with 67 additions and 12 deletions
--- a/examples/SharedMemory/SharedMemoryCommands.h
+++ b/examples/SharedMemory/SharedMemoryCommands.h
@@ -117,6 +117,7 @@ enum EnumInitPoseFlags
    INIT_POSE_HAS_JOINT_STATE=4,
 	INIT_POSE_HAS_BASE_LINEAR_VELOCITY = 8,
 	INIT_POSE_HAS_BASE_ANGULAR_VELOCITY = 16,
+	INIT_POSE_HAS_JOINT_VELOCITY=32,
 };