aboutsummaryrefslogtreecommitdiff
path: root/PhysX_3.4/Source/LowLevelParticles/src/PtCollision.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'PhysX_3.4/Source/LowLevelParticles/src/PtCollision.cpp')
-rw-r--r--PhysX_3.4/Source/LowLevelParticles/src/PtCollision.cpp4
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")
{
}