summaryrefslogtreecommitdiff
path: root/thirdparty/bullet/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-04-27 16:44:17 +0200
committerGitHub <noreply@github.com>2020-04-27 16:44:17 +0200
commitf7e2ff5223aa90fb95e02c4a96cc9261c91f3376 (patch)
treed30bc9dd4e6a4e3aa13b38f2574772f7da737ca4 /thirdparty/bullet/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
parent3fff0dda393e2496744a57d0e3897827c0bdc504 (diff)
parent3e7db60d56d5c25d7aa3fded4b90f36ca341159c (diff)
Merge pull request #38253 from nekomatata/bullet-update-2.90
Update to bullet master (2.90)
Diffstat (limited to 'thirdparty/bullet/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp')
-rw-r--r--thirdparty/bullet/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp3
1 files changed, 2 insertions, 1 deletions
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 <stdio.h>
-
+#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");