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-04-17 19:57:48 -07:00
parent 2989217b65 ad2099e107
commit e8a07e31e6
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -254,7 +254,7 @@ ENDIF()
OPTION(BUILD_BULLET3 "Set when you want to build Bullet 3" ON) OPTION(BUILD_BULLET3 "Set when you want to build Bullet 3" ON)
OPTION(BUILD_PYBULLET "Set when you want to build pybullet (experimental Python bindings for Bullet)" OFF) OPTION(BUILD_PYBULLET "Set when you want to build pybullet (Python bindings for Bullet)" OFF)
OPTION(BUILD_ENET "Set when you want to build apps with enet UDP networking support" ON) OPTION(BUILD_ENET "Set when you want to build apps with enet UDP networking support" ON)
OPTION(BUILD_CLSOCKET "Set when you want to build apps with enet TCP networking support" ON) OPTION(BUILD_CLSOCKET "Set when you want to build apps with enet TCP networking support" ON)

1
examples/Importers/ImportSTLDemo/LoadMeshFromSTL.h
View File

@@ -46,6 +46,7 @@ static GLInstanceGraphicsShape* LoadMeshFromSTL(const char* relativeFileName)
int expectedBinaryFileSize = numTriangles* 50 + 84; int expectedBinaryFileSize = numTriangles* 50 + 84;
if (expectedBinaryFileSize != size) if (expectedBinaryFileSize != size)
{ {
delete[] memoryBuffer;
return 0; return 0;
} }

3
examples/SharedMemory/PhysicsServerCommandProcessor.cpp
View File

@@ -376,7 +376,8 @@ struct MyBroadphaseCallback : public btBroadphaseAabbCallback
if (bodyUniqueId >= 0) if (bodyUniqueId >= 0)
{ {
m_bodyUniqueIds.push_back(bodyUniqueId); m_bodyUniqueIds.push_back(bodyUniqueId);
m_links.push_back(mbl->m_link); //it is not a multibody, so use -1 otherwise
m_links.push_back(-1);
} }
return true; return true;
} }