71f8b809b2
Stop include Bullet headers using `-isystem` for GCC/Clang as it misleads
SCons into not properly rebuilding all files when headers change.
This means we also need to make sure Bullet builds without warning, and
current version fares fairly well, there were just a couple to fix (patch
included).
Increase minimum version for distro packages to 2.90 (this was never released
as the "next" version after 2.89 was 3.05... but that covers it too).
Fixes #43868.
(cherry picked from commit b7901c773c)
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
diff --git a/thirdparty/bullet/BulletSoftBody/btSoftBody.h b/thirdparty/bullet/BulletSoftBody/btSoftBody.h
|
|
index f578487b8c..dfde8fd1e4 100644
|
|
--- a/thirdparty/bullet/BulletSoftBody/btSoftBody.h
|
|
+++ b/thirdparty/bullet/BulletSoftBody/btSoftBody.h
|
|
@@ -1317,8 +1317,8 @@ public:
|
|
}
|
|
for (int k = 0; k < m_faceNodeContacts.size(); ++k)
|
|
{
|
|
- int i = indices[k];
|
|
- btSoftBody::DeformableFaceNodeContact& c = m_faceNodeContacts[i];
|
|
+ int idx = indices[k];
|
|
+ btSoftBody::DeformableFaceNodeContact& c = m_faceNodeContacts[idx];
|
|
btSoftBody::Node* node = c.m_node;
|
|
btSoftBody::Face* face = c.m_face;
|
|
const btVector3& w = c.m_bary;
|
|
diff --git a/thirdparty/bullet/LinearMath/btSerializer.h b/thirdparty/bullet/LinearMath/btSerializer.h
|
|
index ce4fc34e20..11592d2ccd 100644
|
|
--- a/thirdparty/bullet/LinearMath/btSerializer.h
|
|
+++ b/thirdparty/bullet/LinearMath/btSerializer.h
|
|
@@ -499,7 +499,6 @@ public:
|
|
writeDNA();
|
|
|
|
//if we didn't pre-allocate a buffer, we need to create a contiguous buffer now
|
|
- int mysize = 0;
|
|
if (!m_totalSize)
|
|
{
|
|
if (m_buffer)
|
|
@@ -511,14 +510,12 @@ public:
|
|
unsigned char* currentPtr = m_buffer;
|
|
writeHeader(m_buffer);
|
|
currentPtr += BT_HEADER_LENGTH;
|
|
- mysize += BT_HEADER_LENGTH;
|
|
for (int i = 0; i < m_chunkPtrs.size(); i++)
|
|
{
|
|
int curLength = sizeof(btChunk) + m_chunkPtrs[i]->m_length;
|
|
memcpy(currentPtr, m_chunkPtrs[i], curLength);
|
|
btAlignedFree(m_chunkPtrs[i]);
|
|
currentPtr += curLength;
|
|
- mysize += curLength;
|
|
}
|
|
}
|
|
|