summaryrefslogtreecommitdiff
path: root/thirdparty/bullet/LinearMath/btMatrixX.h
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-06-11 13:55:44 +0200
committerGitHub <noreply@github.com>2019-06-11 13:55:44 +0200
commitc499f1475f1c37c6d83985320a9e98a3d2711a2b (patch)
tree8ceaa6bc1d5deb40b7c5fc998041ecd63ad122d9 /thirdparty/bullet/LinearMath/btMatrixX.h
parentf0bacf360dbb6ce3781356438b2fa7067250d27c (diff)
parent99acec63f175fecd7172c927263ed3787cb082d6 (diff)
Merge pull request #29418 from AndreaCatania/upbul
Updated Bullet version to the actual bullet master commit
Diffstat (limited to 'thirdparty/bullet/LinearMath/btMatrixX.h')
-rw-r--r--thirdparty/bullet/LinearMath/btMatrixX.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/thirdparty/bullet/LinearMath/btMatrixX.h b/thirdparty/bullet/LinearMath/btMatrixX.h
index 9df9e49469..388c57c2d7 100644
--- a/thirdparty/bullet/LinearMath/btMatrixX.h
+++ b/thirdparty/bullet/LinearMath/btMatrixX.h
@@ -263,7 +263,10 @@ struct btMatrixX
{
{
BT_PROFILE("storage=0");
- btSetZero(&m_storage[0], m_storage.size());
+ if (m_storage.size())
+ {
+ btSetZero(&m_storage[0], m_storage.size());
+ }
//memset(&m_storage[0],0,sizeof(T)*m_storage.size());
//for (int i=0;i<m_storage.size();i++)
// m_storage[i]=0;
@@ -281,7 +284,7 @@ struct btMatrixX
}
}
- void printMatrix(const char* msg)
+ void printMatrix(const char* msg) const
{
printf("%s ---------------------\n", msg);
for (int i = 0; i < rows(); i++)