summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerwincoumans <erwin.coumans@gmail.com>2022-03-25 19:56:39 -0700
committerGitHub <noreply@github.com>2022-03-25 19:56:39 -0700
commit22d9eec148d3a7dec9d7b10a4344808bf766f73a (patch)
treeaed746b92eb83dca2324e3aee33451ed132961a8
parentae885be38dd66e0b5ec15b7d59f3363f6a6abb06 (diff)
parent5e8a4717b94bc4316b5290f9a60897f2e4744705 (diff)
downloadbullet3-22d9eec148d3a7dec9d7b10a4344808bf766f73a.tar.gz
Merge pull request #4219 from erwincoumans/master3.22a
remove thread import, it is not needed and required C++11
-rw-r--r--src/BulletSoftBody/btDeformableMultiBodyConstraintSolver.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/BulletSoftBody/btDeformableMultiBodyConstraintSolver.cpp b/src/BulletSoftBody/btDeformableMultiBodyConstraintSolver.cpp
index 2a0e5ec34..0f3005417 100644
--- a/src/BulletSoftBody/btDeformableMultiBodyConstraintSolver.cpp
+++ b/src/BulletSoftBody/btDeformableMultiBodyConstraintSolver.cpp
@@ -16,7 +16,7 @@
#include "btDeformableMultiBodyConstraintSolver.h"
#include "BulletReducedDeformableBody/btReducedDeformableBodySolver.h"
#include <iostream>
-#include <thread>
+
// override the iterations method to include deformable/multibody contact
btScalar btDeformableMultiBodyConstraintSolver::solveDeformableGroupIterations(btCollisionObject** bodies, int numBodies, btCollisionObject** deformableBodies, int numDeformableBodies, btPersistentManifold** manifoldPtr, int numManifolds, btTypedConstraint** constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer)
{