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

examples/ExampleBrowser/OpenGLExampleBrowser.cpp

@@ -1204,10 +1204,13 @@ void OpenGLExampleBrowser::updateGraphics()
 
 void OpenGLExampleBrowser::update(float deltaTime)
 {
-	if (!gEnableRenderLoop)
-		return;
+    b3ChromeUtilsEnableProfiling();
 
-	b3ChromeUtilsEnableProfiling();
+    if (!gEnableRenderLoop)
+    {
+        sCurrentDemo->updateGraphics();
+		return;
+    }
 	
 		B3_PROFILE("OpenGLExampleBrowser::update");
 		assert(glGetError()==GL_NO_ERROR);

examples/SharedMemory/PosixSharedMemory.cpp

@@ -91,7 +91,7 @@ void*   PosixSharedMemory::allocateSharedMemory(int key, int size,  bool allowCr
     int id = shmget((key_t) key, (size_t) size,flags);
     if (id < 0)
     {
-        b3Error("shmget error");
+        b3Warning("shmget error");
     } else
     {
         btPointerCaster result;