diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-09-30 12:12:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-30 12:12:48 +0200 |
| commit | b8c92828146ba22e2bb205da73aecc0619581829 (patch) | |
| tree | 12e85ed2af037e8518498517cdfb906edbb3efe3 /thirdparty/bullet/LinearMath/btSerializer.h | |
| parent | 4a9a2315666ecdde98b2e0f61802b005b862203d (diff) | |
| parent | b55fd934ee0e4dfc6dede8bbaadb15bf71eff74e (diff) | |
Merge pull request #48299 from akien-mga/bullet-3.09
Diffstat (limited to 'thirdparty/bullet/LinearMath/btSerializer.h')
| -rw-r--r-- | thirdparty/bullet/LinearMath/btSerializer.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/thirdparty/bullet/LinearMath/btSerializer.h b/thirdparty/bullet/LinearMath/btSerializer.h index 4d1c760e24..f18442f23d 100644 --- a/thirdparty/bullet/LinearMath/btSerializer.h +++ b/thirdparty/bullet/LinearMath/btSerializer.h @@ -480,8 +480,8 @@ public: } buffer[9] = '3'; - buffer[10] = '0'; - buffer[11] = '8'; + buffer[10] = '1'; + buffer[11] = '7'; } virtual void startSerialization() @@ -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; } } |