Merge branch 'master' of https://github.com/erwincoumans/bullet3

2018-05-31 16:06:33 -07:00
parent edc70582dd 8567f6bb7c
commit 3463d0a879
8 changed files with 38 additions and 4 deletions
--- a/examples/SharedMemory/SharedMemoryPublic.h
+++ b/examples/SharedMemory/SharedMemoryPublic.h
@@ -684,6 +684,7 @@ enum eURDF_Flags
 	URDF_GLOBAL_VELOCITIES_MB =256,
 	MJCF_COLORS_FROM_FILE=512,
 	URDF_ENABLE_CACHED_GRAPHICS_SHAPES=1024,
+    URDF_ENABLE_SLEEPING=2048,
 };

 enum eUrdfGeomTypes //sync with UrdfParser UrdfGeomTypes