Merge pull request #24740 from OBKF/update-bullet-physics

Update Bullet physics to commit 126b676

1 files changed, 5 insertions, 13 deletions

diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btEmptyShape.cpp b/thirdparty/bullet/BulletCollision/CollisionShapes/btEmptyShape.cpp
index a9e6df5c58..4699555bd8 100644
--- a/thirdparty/bullet/BulletCollision/CollisionShapes/btEmptyShape.cpp
+++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btEmptyShape.cpp
@@ -15,36 +15,28 @@ subject to the following restrictions:
 
 #include "btEmptyShape.h"
 
-
 #include "btCollisionShape.h"
 
-
-btEmptyShape::btEmptyShape() : btConcaveShape ()
+btEmptyShape::btEmptyShape() : btConcaveShape()
 {
 	m_shapeType = EMPTY_SHAPE_PROXYTYPE;
 }
 
-
 btEmptyShape::~btEmptyShape()
 {
 }
 
-
-	///getAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
-void btEmptyShape::getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const
+///getAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
+void btEmptyShape::getAabb(const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const
 {
-	btVector3 margin(getMargin(),getMargin(),getMargin());
+	btVector3 margin(getMargin(), getMargin(), getMargin());
 
 	aabbMin = t.getOrigin() - margin;
 
 	aabbMax = t.getOrigin() + margin;
-
 }
 
-void	btEmptyShape::calculateLocalInertia(btScalar ,btVector3& ) const
+void btEmptyShape::calculateLocalInertia(btScalar, btVector3&) const
 {
 	btAssert(0);
 }
-
-	
-