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/PhysX/src/buffering | |
| 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/PhysX/src/buffering')
| -rw-r--r-- | PhysX_3.4/Source/PhysX/src/buffering/ScbArticulation.h | 4 | ||||
| -rw-r--r-- | PhysX_3.4/Source/PhysX/src/buffering/ScbBody.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbArticulation.h b/PhysX_3.4/Source/PhysX/src/buffering/ScbArticulation.h index 702b9b18..75465694 100644 --- a/PhysX_3.4/Source/PhysX/src/buffering/ScbArticulation.h +++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbArticulation.h @@ -105,8 +105,8 @@ public: PX_INLINE PxReal getSleepThreshold() const { return read<Buf::BF_SleepThreshold>(); } PX_INLINE void setSleepThreshold(const PxReal v) { write<Buf::BF_SleepThreshold>(v); } - PX_INLINE PxReal getFreezeThreshold() const { return read<Buf::BF_SleepThreshold>(); } - PX_INLINE void setFreezeThreshold(const PxReal v) { write<Buf::BF_SleepThreshold>(v); } + PX_INLINE PxReal getFreezeThreshold() const { return read<Buf::BF_FreezeThreshold>(); } + PX_INLINE void setFreezeThreshold(const PxReal v) { write<Buf::BF_FreezeThreshold>(v); } PX_INLINE PxReal getWakeCounter() const { return mBufferedWakeCounter; } PX_INLINE void setWakeCounter(const PxReal v); diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbBody.h b/PhysX_3.4/Source/PhysX/src/buffering/ScbBody.h index ba8325da..e38961b4 100644 --- a/PhysX_3.4/Source/PhysX/src/buffering/ScbBody.h +++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbBody.h @@ -577,7 +577,7 @@ PX_INLINE bool Body::getKinematicTarget(PxTransform& p) const p = getBodyBuffer()->mKinematicTarget; return true; } - else if(getControlState() != ControlState::eREMOVE_PENDING) + else if(getControlState() != ControlState::eREMOVE_PENDING && (mBodyCore.getFlags() & PxRigidBodyFlag::eKINEMATIC)) return mBodyCore.getKinematicTarget(p); else return false; |