Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Erwin Coumans
2017-09-11 09:39:20 -07:00
parent 105c2c948f 416c29daf7
commit 20f97f78b8
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
examples/ExampleBrowser/OpenGLExampleBrowser.cpp
View File

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

2
examples/SharedMemory/PosixSharedMemory.cpp
View File

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