Merge pull request #4219 from erwincoumans/master

erwincoumans · web-flow · commit 22d9eec148d3 · 2022-03-25T19:56:39.000-07:00
remove thread import, it is not needed and required C++11
diff --git 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)
 {

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`#include "btDeformableMultiBodyConstraintSolver.h"`
`17`	`17`	`#include "BulletReducedDeformableBody/btReducedDeformableBodySolver.h"`
`18`	`18`	`#include <iostream>`
`19`		`-#include <thread>`
	`19`	`+`
`20`	`20`	`// override the iterations method to include deformable/multibody contact`
`21`	`21`	`btScalar btDeformableMultiBodyConstraintSolver::solveDeformableGroupIterations(btCollisionObject bodies, int numBodies, btCollisionObject deformableBodies, int numDeformableBodies, btPersistentManifold manifoldPtr, int numManifolds, btTypedConstraint constraints, int numConstraints, const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer)`
`22`	`22`	`{`