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

setup.py

@@ -463,15 +463,16 @@ egl_renderer_sources = \
 +["src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp"]\
 +["src/Bullet3Common/b3Logging.cpp"]\
 +["src/LinearMath/btAlignedAllocator.cpp"]\
-+["src/LinearMath/btGeometryUtil.cpp"]\
 +["src/LinearMath/btConvexHull.cpp"]\
-+["src/LinearMath/btConvexHullComputer.cpp"]\
++["src/LinearMath/btConvexHullComputer.cpp"] \
++["src/LinearMath/btGeometryUtil.cpp"]\
++["src/LinearMath/btQuickprof.cpp"] \
++["src/LinearMath/btThreads.cpp"] \
 +["src/Bullet3Common/b3AlignedAllocator.cpp"] \
 +["examples/ThirdPartyLibs/glad/gl.c"]\
 +["examples/OpenGLWindow/GLInstancingRenderer.cpp"]\
 +["examples/OpenGLWindow/GLRenderToTexture.cpp"] \
-+["examples/OpenGLWindow/LoadShader.cpp"] \
-+["src/LinearMath/btQuickprof.cpp"]
++["examples/OpenGLWindow/LoadShader.cpp"]
 
 if 'BT_USE_EGL' in CXX_FLAGS:
     sources += ['examples/ThirdPartyLibs/glad/egl.c']

src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h

@@ -34,6 +34,8 @@ class btCollisionObject;
 
 class btCollisionShape;
 
+extern btShapePairCallback gCompoundCompoundChildShapePairCallback;
+
 /// btCompoundCompoundCollisionAlgorithm  supports collision between two btCompoundCollisionShape shapes
 class btCompoundCompoundCollisionAlgorithm : public btCompoundCollisionAlgorithm
 {

src/BulletCollision/Gimpact/btGImpactBvh.h

@@ -1,5 +1,5 @@
-#ifndef GIM_BOX_SET_H_INCLUDED
-#define GIM_BOX_SET_H_INCLUDED
+#ifndef BT_GIMPACT_BVH_H_INCLUDED
+#define BT_GIMPACT_BVH_H_INCLUDED
 
 /*! \file gim_box_set.h
 \author Francisco Leon Najera
@@ -306,4 +306,4 @@ public:
 							   btPairSet& collision_pairs);
 };
 
-#endif  // GIM_BOXPRUNING_H_INCLUDED
+#endif  // BT_GIMPACT_BVH_H_INCLUDED