diff options
| author | sschirm <[email protected]> | 2016-12-23 14:20:36 +0100 |
|---|---|---|
| committer | sschirm <[email protected]> | 2016-12-23 14:56:17 +0100 |
| commit | ef6937e69e8ee3f409cf9d460d5ad300a65d5924 (patch) | |
| tree | 710426e8daa605551ce3f34b581897011101c30f /PhysX_3.4/Source/PhysXExtensions/src/serialization/Binary | |
| parent | Initial commit: (diff) | |
| download | physx-3.4-ef6937e69e8ee3f409cf9d460d5ad300a65d5924.tar.xz physx-3.4-ef6937e69e8ee3f409cf9d460d5ad300a65d5924.zip | |
PhysX 3.4 / APEX 1.4 release candidate @21506124
Diffstat (limited to 'PhysX_3.4/Source/PhysXExtensions/src/serialization/Binary')
| -rw-r--r-- | PhysX_3.4/Source/PhysXExtensions/src/serialization/Binary/SnConvX_MetaData.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/PhysX_3.4/Source/PhysXExtensions/src/serialization/Binary/SnConvX_MetaData.cpp b/PhysX_3.4/Source/PhysXExtensions/src/serialization/Binary/SnConvX_MetaData.cpp index 4d2eda22..e591f7be 100644 --- a/PhysX_3.4/Source/PhysXExtensions/src/serialization/Binary/SnConvX_MetaData.cpp +++ b/PhysX_3.4/Source/PhysXExtensions/src/serialization/Binary/SnConvX_MetaData.cpp @@ -26,6 +26,7 @@ // Copyright (c) 2008-2016 NVIDIA Corporation. All rights reserved. #include "foundation/PxIO.h" +#include "foundation/PxMemory.h" #include "SnConvX.h" #include "common/PxSerialFramework.h" #include "serialization/SnSerialUtils.h" @@ -694,7 +695,7 @@ bool MetaData::load(PxInputStream& inputStream, MetaDataType type) if(entries[j].mFlags & PxMetaDataFlag::eEXTRA_DATA) newEntries[nb++] = entries[j]; assert(nb==nbFields); - memcpy(entries, newEntries, nb*sizeof(PxMetaDataEntry)); + PxMemCopy(entries, newEntries, nb*sizeof(PxMetaDataEntry)); PX_DELETE_ARRAY(newEntries); qsort(entries, size_t(nbToSort), sizeof(PxMetaDataEntry), Local::compareEntries); } |