diff options
| author | Sheikh Dawood Abdul Ajees <[email protected]> | 2017-04-25 16:02:08 -0500 |
|---|---|---|
| committer | Sheikh Dawood Abdul Ajees <[email protected]> | 2017-04-25 16:02:08 -0500 |
| commit | d11708e398c2f6377d9eac2b1f7248c62faab569 (patch) | |
| tree | 5778e794690c046ab4b0205d8f764960a5af168b /PhysX_3.4/Source/LowLevelParticles/src/PtCollision.cpp | |
| parent | PhysX 3.4, APEX 1.4 patch release @21821222 (diff) | |
| download | physx-3.4-d11708e398c2f6377d9eac2b1f7248c62faab569.tar.xz physx-3.4-d11708e398c2f6377d9eac2b1f7248c62faab569.zip | |
PhysX 3.4, APEX 1.4 patch release @22017166
Diffstat (limited to 'PhysX_3.4/Source/LowLevelParticles/src/PtCollision.cpp')
| -rw-r--r-- | PhysX_3.4/Source/LowLevelParticles/src/PtCollision.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/PhysX_3.4/Source/LowLevelParticles/src/PtCollision.cpp b/PhysX_3.4/Source/LowLevelParticles/src/PtCollision.cpp index 2aa44f6a..fc9cabd7 100644 --- a/PhysX_3.4/Source/LowLevelParticles/src/PtCollision.cpp +++ b/PhysX_3.4/Source/LowLevelParticles/src/PtCollision.cpp @@ -53,7 +53,7 @@ namespace Pt class CollisionTask : public Cm::Task { public: - CollisionTask(Collision& context, PxU32 taskDataIndex) : mCollisionContext(context), mTaskDataIndex(taskDataIndex) + CollisionTask(Collision& context, PxU32 taskDataIndex) : Cm::Task(0), mCollisionContext(context), mTaskDataIndex(taskDataIndex) { } @@ -83,7 +83,7 @@ how to support dominance-driven one/two-way collision (search for 'todo dominanc - use this flag when copying impulse to collData.shapeImpulse */ Collision::Collision(ParticleSystemSimCpu& particleSystem) -: mParticleSystem(particleSystem), mMergeTask(this, "Collision.mergeResults") +: mParticleSystem(particleSystem), mMergeTask(0, this, "Collision.mergeResults") { } |