From e1352dbede391151fa4e04ed093a0feedd2d4805 Mon Sep 17 00:00:00 2001 From: halx99 Date: Sat, 27 Mar 2021 20:08:55 +0800 Subject: [PATCH] Track bt to 3.09 #333 --- external/README.md | 2 +- external/bullet/BulletDynamics/Featherstone/btMultiBody.cpp | 2 +- external/bullet/BulletDynamics/Featherstone/btMultiBody.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/external/README.md b/external/README.md index 0ffccd62e7..5aa96f6ac0 100644 --- a/external/README.md +++ b/external/README.md @@ -16,7 +16,7 @@ ## Bullet - Upstream: https://github.com/bulletphysics/bullet3 -- Version: 3.08 +- Version: 3.09 - License: zlib ## c-ares diff --git a/external/bullet/BulletDynamics/Featherstone/btMultiBody.cpp b/external/bullet/BulletDynamics/Featherstone/btMultiBody.cpp index 7cb92fa3b4..dfc4f92a36 100644 --- a/external/bullet/BulletDynamics/Featherstone/btMultiBody.cpp +++ b/external/bullet/BulletDynamics/Featherstone/btMultiBody.cpp @@ -1411,7 +1411,7 @@ void btMultiBody::solveImatrix(const btSpatialForceVector &rhs, btSpatialMotionV } } -void btMultiBody::mulMatrix(btScalar *pA, btScalar *pB, int rowsA, int colsA, int rowsB, int colsB, btScalar *pC) const +void btMultiBody::mulMatrix(const btScalar *pA, const btScalar *pB, int rowsA, int colsA, int rowsB, int colsB, btScalar *pC) const { for (int row = 0; row < rowsA; row++) { diff --git a/external/bullet/BulletDynamics/Featherstone/btMultiBody.h b/external/bullet/BulletDynamics/Featherstone/btMultiBody.h index 5a3efc9414..9cf1ceb5a6 100644 --- a/external/bullet/BulletDynamics/Featherstone/btMultiBody.h +++ b/external/bullet/BulletDynamics/Featherstone/btMultiBody.h @@ -745,7 +745,7 @@ private: } } - void mulMatrix(btScalar * pA, btScalar * pB, int rowsA, int colsA, int rowsB, int colsB, btScalar *pC) const; + void mulMatrix(const btScalar *pA, const btScalar *pB, int rowsA, int colsA, int rowsB, int colsB, btScalar *pC) const; private: btMultiBodyLinkCollider *m_baseCollider; //can be NULL