diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-12-17 13:51:12 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-12-18 13:41:11 +0100 |
| commit | 3cbf8bde8455f98f9b447237ebfe578aca397574 (patch) | |
| tree | 175f1f5daee4928a8f78d4d5853d7da99902e940 /thirdparty/bullet/BulletCollision/Gimpact | |
| parent | 214a22b98e5d74a9b49346d5021641db6a9899cf (diff) | |
bullet: Sync with upstream 3.07
Diffstat (limited to 'thirdparty/bullet/BulletCollision/Gimpact')
| -rw-r--r-- | thirdparty/bullet/BulletCollision/Gimpact/btGImpactShape.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/thirdparty/bullet/BulletCollision/Gimpact/btGImpactShape.h b/thirdparty/bullet/BulletCollision/Gimpact/btGImpactShape.h index 5b85e87041..cc91079579 100644 --- a/thirdparty/bullet/BulletCollision/Gimpact/btGImpactShape.h +++ b/thirdparty/bullet/BulletCollision/Gimpact/btGImpactShape.h @@ -623,13 +623,21 @@ public: i1 = s_indices[1]; i2 = s_indices[2]; } - else + else if (indicestype == PHY_INTEGER) { unsigned int* i_indices = (unsigned int*)(indexbase + face_index * indexstride); i0 = i_indices[0]; i1 = i_indices[1]; i2 = i_indices[2]; } + else + { + btAssert(indicestype == PHY_UCHAR); + unsigned char* i_indices = (unsigned char*)(indexbase + face_index * indexstride); + i0 = i_indices[0]; + i1 = i_indices[1]; + i2 = i_indices[2]; + } } SIMD_FORCE_INLINE void get_vertex(unsigned int vertex_index, btVector3& vertex) const |