PhysX 3.4, APEX 1.4 patch release @22017166

4 files changed, 15 insertions, 15 deletions

diff --git a/PhysX_3.4/Source/LowLevelParticles/src/PtBatcher.cpp b/PhysX_3.4/Source/LowLevelParticles/src/PtBatcher.cpp
index b3814f81..d5dfad94 100644
--- a/PhysX_3.4/Source/LowLevelParticles/src/PtBatcher.cpp
+++ b/PhysX_3.4/Source/LowLevelParticles/src/PtBatcher.cpp
@@ -93,10 +93,10 @@ static void sortBatchedInputs(ParticleSystemSim** particleSystems, T* inputs, Px
 }
 
 Batcher::Batcher(class Context& _context)
-: shapeGenTask("Pt::Batcher::shapeGen")
-, dynamicsCpuTask("Pt::Batcher::dynamicsCpu")
-, collPrepTask("Pt::Batcher::collPrep")
-, collisionCpuTask("Pt::Batcher::collisionCpu")
+: shapeGenTask(0, "Pt::Batcher::shapeGen")
+, dynamicsCpuTask(0, "Pt::Batcher::dynamicsCpu")
+, collPrepTask(0, "Pt::Batcher::collPrep")
+, collisionCpuTask(0, "Pt::Batcher::collisionCpu")
 , context(_context)
 {
 }
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")
 {
 }
 
diff --git a/PhysX_3.4/Source/LowLevelParticles/src/PtDynamics.cpp b/PhysX_3.4/Source/LowLevelParticles/src/PtDynamics.cpp
index ba3b5f87..1c07c3b8 100644
--- a/PhysX_3.4/Source/LowLevelParticles/src/PtDynamics.cpp
+++ b/PhysX_3.4/Source/LowLevelParticles/src/PtDynamics.cpp
@@ -144,7 +144,7 @@ namespace Pt
 class DynamicsSphTask : public Cm::Task
 {
   public:
-	DynamicsSphTask(Dynamics& context, PxU32 taskDataIndex) : mDynamicsContext(context), mTaskDataIndex(taskDataIndex)
+	DynamicsSphTask(Dynamics& context, PxU32 taskDataIndex) : Cm::Task(0), mDynamicsContext(context), mTaskDataIndex(taskDataIndex)
 	{
 	}
 
@@ -171,8 +171,8 @@ Dynamics::Dynamics(ParticleSystemSimCpu& particleSystem)
 : mParticleSystem(particleSystem)
 , mTempReorderedParticles(NULL)
 , mTempParticleForceBuf(NULL)
-, mMergeDensityTask(this, "Pt::Dynamics.mergeDensity")
-, mMergeForceTask(this, "Pt::Dynamics.mergeForce")
+, mMergeDensityTask(0, this, "Pt::Dynamics.mergeDensity")
+, mMergeForceTask(0, this, "Pt::Dynamics.mergeForce")
 , mNumTempBuffers(0)
 {
 }
diff --git a/PhysX_3.4/Source/LowLevelParticles/src/PtParticleSystemSimCpu.cpp b/PhysX_3.4/Source/LowLevelParticles/src/PtParticleSystemSimCpu.cpp
index 3c1e89f5..d8d67453 100644
--- a/PhysX_3.4/Source/LowLevelParticles/src/PtParticleSystemSimCpu.cpp
+++ b/PhysX_3.4/Source/LowLevelParticles/src/PtParticleSystemSimCpu.cpp
@@ -317,12 +317,12 @@ ParticleSystemSimCpu::ParticleSystemSimCpu(ContextCpu* context, PxU32 index)
 , mDynamics(*this)
 , mCollision(*this)
 , mIndex(index)
-, mPacketShapesUpdateTask(this, "Pt::ParticleSystemSimCpu.packetShapesUpdate")
-, mPacketShapesFinalizationTask(this, "Pt::ParticleSystemSimCpu.packetShapesFinalization")
-, mDynamicsUpdateTask(this, "Pt::ParticleSystemSimCpu.dynamicsUpdate")
-, mCollisionUpdateTask(this, "Pt::ParticleSystemSimCpu.collisionUpdate")
-, mCollisionFinalizationTask(this, "Pt::ParticleSystemSimCpu.collisionFinalization")
-, mSpatialHashUpdateSectionsTask(this, "Pt::ParticleSystemSimCpu.spatialHashUpdateSections")
+, mPacketShapesUpdateTask(0, this, "Pt::ParticleSystemSimCpu.packetShapesUpdate")
+, mPacketShapesFinalizationTask(0, this, "Pt::ParticleSystemSimCpu.packetShapesFinalization")
+, mDynamicsUpdateTask(0, this, "Pt::ParticleSystemSimCpu.dynamicsUpdate")
+, mCollisionUpdateTask(0, this, "Pt::ParticleSystemSimCpu.collisionUpdate")
+, mCollisionFinalizationTask(0, this, "Pt::ParticleSystemSimCpu.collisionFinalization")
+, mSpatialHashUpdateSectionsTask(0, this, "Pt::ParticleSystemSimCpu.spatialHashUpdateSections")
 {
 }