diff options
| author | Sheikh Dawood Abdul Ajees <[email protected]> | 2017-11-20 14:41:07 -0600 |
|---|---|---|
| committer | Sheikh Dawood Abdul Ajees <[email protected]> | 2017-11-20 15:22:41 -0600 |
| commit | 4bda45ce4e8b509eb0da786a6044006942ac259c (patch) | |
| tree | a51eb808016e1710a4bbd537000a493250602944 /PhysX_3.4/Source/PhysXCooking/src | |
| parent | Update README.md (diff) | |
| parent | PhysX 3.4.1, APEX 1.4.1 Release @23131702 (diff) | |
| download | physx-3.4-4bda45ce4e8b509eb0da786a6044006942ac259c.tar.xz physx-3.4-4bda45ce4e8b509eb0da786a6044006942ac259c.zip | |
Merge branch 'master'
Diffstat (limited to 'PhysX_3.4/Source/PhysXCooking/src')
| -rw-r--r-- | PhysX_3.4/Source/PhysXCooking/src/convex/ConvexMeshBuilder.cpp | 4 | ||||
| -rw-r--r-- | PhysX_3.4/Source/PhysXCooking/src/convex/QuickHullConvexHullLib.cpp | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/PhysX_3.4/Source/PhysXCooking/src/convex/ConvexMeshBuilder.cpp b/PhysX_3.4/Source/PhysXCooking/src/convex/ConvexMeshBuilder.cpp index 0d283d9f..851368c4 100644 --- a/PhysX_3.4/Source/PhysXCooking/src/convex/ConvexMeshBuilder.cpp +++ b/PhysX_3.4/Source/PhysXCooking/src/convex/ConvexMeshBuilder.cpp @@ -261,9 +261,7 @@ bool ConvexMeshBuilder::loadConvexHull(const PxConvexMeshDesc& desc, ConvexHullL while (dest < pastLastDest) { const PxU16 * trig16 = reinterpret_cast<const PxU16*>(source); - *dest++ = trig16[0]; - *dest++ = trig16[1]; - *dest++ = trig16[2]; + *dest++ = *trig16; source += desc.indices.stride; } } diff --git a/PhysX_3.4/Source/PhysXCooking/src/convex/QuickHullConvexHullLib.cpp b/PhysX_3.4/Source/PhysXCooking/src/convex/QuickHullConvexHullLib.cpp index 95bd314d..b9d0adfc 100644 --- a/PhysX_3.4/Source/PhysXCooking/src/convex/QuickHullConvexHullLib.cpp +++ b/PhysX_3.4/Source/PhysXCooking/src/convex/QuickHullConvexHullLib.cpp @@ -1202,7 +1202,7 @@ namespace local // vertex limit has been reached. We did not stopped the iteration, since we // will use the produced hull to compute OBB from it and use the planes // to slice the initial OBB - if (numVerts >= mConvexDesc.vertexLimit) + if (numVerts > mConvexDesc.vertexLimit) { return QuickHullResult::eVERTEX_LIMIT_REACHED; } |