From 3e7db60d56d5c25d7aa3fded4b90f36ca341159c Mon Sep 17 00:00:00 2001 From: PouleyKetchoupp Date: Mon, 27 Apr 2020 10:15:23 +0200 Subject: Update to bullet master (2.90) --- thirdparty/bullet/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'thirdparty/bullet/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp') diff --git a/thirdparty/bullet/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp b/thirdparty/bullet/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp index 56d8083f22..5b65216e4b 100644 --- a/thirdparty/bullet/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp +++ b/thirdparty/bullet/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp @@ -48,9 +48,10 @@ btSoftRigidCollisionAlgorithm::~btSoftRigidCollisionAlgorithm() } #include - +#include "LinearMath/btQuickprof.h" void btSoftRigidCollisionAlgorithm::processCollision(const btCollisionObjectWrapper* body0Wrap, const btCollisionObjectWrapper* body1Wrap, const btDispatcherInfo& dispatchInfo, btManifoldResult* resultOut) { + BT_PROFILE("btSoftRigidCollisionAlgorithm::processCollision"); (void)dispatchInfo; (void)resultOut; //printf("btSoftRigidCollisionAlgorithm\n"); -- cgit v1.2.3