summaryrefslogtreecommitdiff
path: root/thirdparty/bullet/BulletDynamics/ConstraintSolver/btConstraintSolver.h
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2018-09-07 15:09:02 -0300
committerGitHub <noreply@github.com>2018-09-07 15:09:02 -0300
commitec4b8e4a5a96457ef5f88f87205363b86b7c7615 (patch)
tree7a984cec670365b967671afdccb4de41aaad4c5b /thirdparty/bullet/BulletDynamics/ConstraintSolver/btConstraintSolver.h
parent6ce9951d9e487cfacec40ea27e2a2be241d9da77 (diff)
parent6142448417f4e15bf0bc0c94df7d1862a790e3c7 (diff)
Merge pull request #21836 from AndreaCatania/bulletUpdate
Update bullet to Master 12409f1118a7c7a266f9071350c70789dfe73bb9
Diffstat (limited to 'thirdparty/bullet/BulletDynamics/ConstraintSolver/btConstraintSolver.h')
-rw-r--r--thirdparty/bullet/BulletDynamics/ConstraintSolver/btConstraintSolver.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btConstraintSolver.h b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btConstraintSolver.h
index 890afe6da4..0491639f70 100644
--- a/thirdparty/bullet/BulletDynamics/ConstraintSolver/btConstraintSolver.h
+++ b/thirdparty/bullet/BulletDynamics/ConstraintSolver/btConstraintSolver.h
@@ -34,7 +34,8 @@ enum btConstraintSolverType
{
BT_SEQUENTIAL_IMPULSE_SOLVER=1,
BT_MLCP_SOLVER=2,
- BT_NNCG_SOLVER=4
+ BT_NNCG_SOLVER=4,
+ BT_MULTIBODY_SOLVER=8,
};
class btConstraintSolver