diff options
| author | Marijn Tamis <[email protected]> | 2019-04-29 16:21:42 +0200 |
|---|---|---|
| committer | Marijn Tamis <[email protected]> | 2019-04-29 16:21:42 +0200 |
| commit | 90963f4c0a38c705fe85101f2be5fdd09911b10f (patch) | |
| tree | 34ca6c9e642ce4998612e3ee5bf3264a57c21277 /NvCloth/src/SwClothData.cpp | |
| parent | 1.1.6 Release. (diff) | |
| download | nvcloth-90963f4c0a38c705fe85101f2be5fdd09911b10f.tar.xz nvcloth-90963f4c0a38c705fe85101f2be5fdd09911b10f.zip | |
Fix potential namespace issues when using NvCloth together with PhysX.
Diffstat (limited to 'NvCloth/src/SwClothData.cpp')
| -rw-r--r-- | NvCloth/src/SwClothData.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/NvCloth/src/SwClothData.cpp b/NvCloth/src/SwClothData.cpp index d346d98..ee8ae8f 100644 --- a/NvCloth/src/SwClothData.cpp +++ b/NvCloth/src/SwClothData.cpp @@ -151,7 +151,7 @@ void cloth::SwClothData::verify() const // perhaps a good reason to construct SwClothData on PPU instead NV_CLOTH_ASSERT(!mNumCapsules || - mNumSpheres > *shdfnd::maxElement(&mCapsuleIndices->first, &(mCapsuleIndices + mNumCapsules)->first)); + mNumSpheres > *ps::maxElement(&mCapsuleIndices->first, &(mCapsuleIndices + mNumCapsules)->first)); - NV_CLOTH_ASSERT(!mNumConvexes || (static_cast<uint64_t>(1) << static_cast<uint64_t>(mNumPlanes)) - static_cast<uint64_t>(1) >= static_cast<uint64_t>(*shdfnd::maxElement(mConvexMasks, mConvexMasks + mNumConvexes))); + NV_CLOTH_ASSERT(!mNumConvexes || (static_cast<uint64_t>(1) << static_cast<uint64_t>(mNumPlanes)) - static_cast<uint64_t>(1) >= static_cast<uint64_t>(*ps::maxElement(mConvexMasks, mConvexMasks + mNumConvexes))); } |