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/Bullet3Serialize/Bullet2FileLoader | |
| parent | 214a22b98e5d74a9b49346d5021641db6a9899cf (diff) | |
bullet: Sync with upstream 3.07
Diffstat (limited to 'thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader')
| -rw-r--r-- | thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3File.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3File.cpp b/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3File.cpp index 145de62db3..f6c779a919 100644 --- a/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3File.cpp +++ b/thirdparty/bullet/Bullet3Serialize/Bullet2FileLoader/b3File.cpp @@ -851,12 +851,12 @@ void bFile::swapData(char *data, short type, int arraySize, bool ignoreEndianFla void bFile::safeSwapPtr(char *dst, const char *src) { + if (!src || !dst) + return; + int ptrFile = mFileDNA->getPointerSize(); int ptrMem = mMemoryDNA->getPointerSize(); - if (!src && !dst) - return; - if (ptrFile == ptrMem) { memcpy(dst, src, ptrMem); |