diff options
| author | Sheikh Dawood Abdul Ajees <[email protected]> | 2017-09-15 15:41:57 -0500 |
|---|---|---|
| committer | Sheikh Dawood Abdul Ajees <[email protected]> | 2017-09-15 15:41:57 -0500 |
| commit | d1c812f1162e5fdb13c215792725b2591d7428f5 (patch) | |
| tree | 407056c45c7e9320c48fca6a3697d81a061c4ea0 /PhysX_3.4/Source/Common/src | |
| parent | PhysX 3.4, APEX 1.4 patch release @22121272 (diff) | |
| download | physx-3.4-d1c812f1162e5fdb13c215792725b2591d7428f5.tar.xz physx-3.4-d1c812f1162e5fdb13c215792725b2591d7428f5.zip | |
PhysX 3.4.1, APEX 1.4.1 Release @22845541v3.4.1
Diffstat (limited to 'PhysX_3.4/Source/Common/src')
| -rw-r--r-- | PhysX_3.4/Source/Common/src/CmIDPool.h | 2 | ||||
| -rw-r--r-- | PhysX_3.4/Source/Common/src/CmPtrTable.cpp | 2 | ||||
| -rw-r--r-- | PhysX_3.4/Source/Common/src/CmTask.h | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/PhysX_3.4/Source/Common/src/CmIDPool.h b/PhysX_3.4/Source/Common/src/CmIDPool.h index 345df2fd..58673eae 100644 --- a/PhysX_3.4/Source/Common/src/CmIDPool.h +++ b/PhysX_3.4/Source/Common/src/CmIDPool.h @@ -109,7 +109,7 @@ namespace Cm const PxU32 deferredFreeIDCount = mDeferredFreeIDs.size(); for(PxU32 a = 0; a < deferredFreeIDCount;++a) { - this->mFreeIDs.pushBack(mDeferredFreeIDs[a]); + IDPoolBase<FreeBuffer>::freeID(mDeferredFreeIDs[a]); } mDeferredFreeIDs.clear(); } diff --git a/PhysX_3.4/Source/Common/src/CmPtrTable.cpp b/PhysX_3.4/Source/Common/src/CmPtrTable.cpp index 50ab31c0..96e437a8 100644 --- a/PhysX_3.4/Source/Common/src/CmPtrTable.cpp +++ b/PhysX_3.4/Source/Common/src/CmPtrTable.cpp @@ -75,8 +75,6 @@ PxU32 PtrTable::find(const void* ptr) const if(ptrs[i] == ptr) return i; } - - PX_ASSERT(0); return 0xffffffff; } diff --git a/PhysX_3.4/Source/Common/src/CmTask.h b/PhysX_3.4/Source/Common/src/CmTask.h index 6cb11f19..40a89ffb 100644 --- a/PhysX_3.4/Source/Common/src/CmTask.h +++ b/PhysX_3.4/Source/Common/src/CmTask.h @@ -58,7 +58,7 @@ namespace Cm virtual void run() { -#if PX_NX // special case because default rounding mode is not nearest +#if PX_SWITCH // special case because default rounding mode is not nearest PX_FPU_GUARD; #else PX_SIMD_GUARD; @@ -77,7 +77,7 @@ namespace Cm virtual void run() { -#if PX_NX // special case because default rounding mode is not nearest +#if PX_SWITCH // special case because default rounding mode is not nearest PX_FPU_GUARD; #else PX_SIMD_GUARD; |