diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2018-09-07 15:09:02 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-07 15:09:02 -0300 |
| commit | ec4b8e4a5a96457ef5f88f87205363b86b7c7615 (patch) | |
| tree | 7a984cec670365b967671afdccb4de41aaad4c5b /thirdparty/bullet/BulletCollision/CollisionShapes/btCompoundShape.cpp | |
| parent | 6ce9951d9e487cfacec40ea27e2a2be241d9da77 (diff) | |
| parent | 6142448417f4e15bf0bc0c94df7d1862a790e3c7 (diff) | |
Merge pull request #21836 from AndreaCatania/bulletUpdate
Update bullet to Master 12409f1118a7c7a266f9071350c70789dfe73bb9
Diffstat (limited to 'thirdparty/bullet/BulletCollision/CollisionShapes/btCompoundShape.cpp')
| -rw-r--r-- | thirdparty/bullet/BulletCollision/CollisionShapes/btCompoundShape.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btCompoundShape.cpp b/thirdparty/bullet/BulletCollision/CollisionShapes/btCompoundShape.cpp index e8c8c336cd..85572da307 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btCompoundShape.cpp +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btCompoundShape.cpp @@ -213,7 +213,7 @@ void btCompoundShape::calculateLocalInertia(btScalar mass,btVector3& inertia) co -void btCompoundShape::calculatePrincipalAxisTransform(btScalar* masses, btTransform& principal, btVector3& inertia) const +void btCompoundShape::calculatePrincipalAxisTransform(const btScalar* masses, btTransform& principal, btVector3& inertia) const { int n = m_children.size(); |