diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2020-12-18 14:06:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-18 14:06:40 +0100 |
| commit | 8180b607b85cb290dc4654cdacc2629a7eb325a5 (patch) | |
| tree | 586240d54b8697cf4f122033ca63c6f1ec64d4bb /thirdparty/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp | |
| parent | d54d958a3e429460f7b6145b65f82df799e3e7cc (diff) | |
| parent | 3cbf8bde8455f98f9b447237ebfe578aca397574 (diff) | |
Merge pull request #44455 from akien-mga/bullet-3.07
bullet: Sync with upstream 3.07
Diffstat (limited to 'thirdparty/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp')
| -rw-r--r-- | thirdparty/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/thirdparty/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp b/thirdparty/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp index 34e7926f17..cab6980b65 100644 --- a/thirdparty/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp +++ b/thirdparty/bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp @@ -21,8 +21,7 @@ btHeightfieldTerrainShape::btHeightfieldTerrainShape( int heightStickWidth, int heightStickLength, const void* heightfieldData, btScalar heightScale, btScalar minHeight, btScalar maxHeight, int upAxis, PHY_ScalarType hdt, bool flipQuadEdges) - :m_userIndex2(-1), - m_userValue3(0), + :m_userValue3(0), m_triangleInfoMap(0) { initialize(heightStickWidth, heightStickLength, heightfieldData, @@ -31,8 +30,7 @@ btHeightfieldTerrainShape::btHeightfieldTerrainShape( } btHeightfieldTerrainShape::btHeightfieldTerrainShape(int heightStickWidth, int heightStickLength, const void* heightfieldData, btScalar maxHeight, int upAxis, bool useFloatData, bool flipQuadEdges) - :m_userIndex2(-1), - m_userValue3(0), + : m_userValue3(0), m_triangleInfoMap(0) { // legacy constructor: support only float or unsigned char, |