From 92a34440762ab94aec1ee766ef41b176ab7b6ef7 Mon Sep 17 00:00:00 2001 From: erwincoumans Date: Tue, 11 Apr 2017 13:07:29 -0700 Subject: [PATCH 1/2] Update CMakeLists.txt remove 'experimental' from Python bindings, since it has been in use for quite a while without issues. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 33fdba6bb..d24aefb9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -254,7 +254,7 @@ ENDIF() 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_CLSOCKET "Set when you want to build apps with enet TCP networking support" ON) From ad2099e107174759cf6d4d80469fd6c157858b89 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Mon, 17 Apr 2017 10:01:44 -0700 Subject: [PATCH 2/2] address 2 issues pointed out by PVS-Studio: https://github.com/bulletphysics/bullet3/issues/1074 --- examples/Importers/ImportSTLDemo/LoadMeshFromSTL.h | 1 + examples/SharedMemory/PhysicsServerCommandProcessor.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/Importers/ImportSTLDemo/LoadMeshFromSTL.h b/examples/Importers/ImportSTLDemo/LoadMeshFromSTL.h index 95cd93ef3..78d386731 100644 --- a/examples/Importers/ImportSTLDemo/LoadMeshFromSTL.h +++ b/examples/Importers/ImportSTLDemo/LoadMeshFromSTL.h @@ -46,6 +46,7 @@ static GLInstanceGraphicsShape* LoadMeshFromSTL(const char* relativeFileName) int expectedBinaryFileSize = numTriangles* 50 + 84; if (expectedBinaryFileSize != size) { + delete[] memoryBuffer; return 0; } diff --git a/examples/SharedMemory/PhysicsServerCommandProcessor.cpp b/examples/SharedMemory/PhysicsServerCommandProcessor.cpp index 46bd40a31..bfd6bc804 100644 --- a/examples/SharedMemory/PhysicsServerCommandProcessor.cpp +++ b/examples/SharedMemory/PhysicsServerCommandProcessor.cpp @@ -376,7 +376,8 @@ struct MyBroadphaseCallback : public btBroadphaseAabbCallback if (bodyUniqueId >= 0) { 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; }