From 469a00e23bf1c43cd190a76372f85bac9d9f9947 Mon Sep 17 00:00:00 2001
From: Mike Goslin <mikegoslin@users.sourceforge.net>
Date: Tue, 30 Jan 2001 20:33:02 +0000
Subject: [PATCH] *** empty log message ***

---
 direct/src/particles/ForceGroup.py   | 18 ++++++++----------
 direct/src/particles/ParticleTest.py |  1 -
 direct/src/particles/Particles.py    | 14 ++++++++------
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/direct/src/particles/ForceGroup.py b/direct/src/particles/ForceGroup.py
index a97df96726..0e3dad2076 100644
--- a/direct/src/particles/ForceGroup.py
+++ b/direct/src/particles/ForceGroup.py
@@ -27,20 +27,18 @@ class ForceGroup(DirectObject):
     def enable(self):
 	"""enable(self)
 	   Convenience function to enable all forces in force group"""
-	if (self.fEnabled == 0):
-	    for i in range(self.node.getNumForces()):
-	    	f = self.node.getForce(i)
-	    	f.setActive(1)	
-            self.fEnabled = 1
+	for i in range(self.node.getNumForces()):
+	    f = self.node.getForce(i)
+	    f.setActive(1)	
+        self.fEnabled = 1
 
     def disable(self):
 	"""disable(self)
 	   Convenience function to disable all forces in force group"""
-	if (self.fEnabled == 1):
-	    for i in range(self.node.getNumForces()):
-	    	f = self.node.getForce(i)
-		f.setActive(0)
-            self.fEnabled = 0
+	for i in range(self.node.getNumForces()):
+	    f = self.node.getForce(i)
+	    f.setActive(0)
+        self.fEnabled = 0
 
     def isEnabled(self):
         return self.fEnabled
diff --git a/direct/src/particles/ParticleTest.py b/direct/src/particles/ParticleTest.py
index 317022f72b..ffc9abb1ac 100644
--- a/direct/src/particles/ParticleTest.py
+++ b/direct/src/particles/ParticleTest.py
@@ -17,7 +17,6 @@ pe = ParticleEffect.ParticleEffect('particle-fx')
 pe.reparentTo(render)
 pe.setPos(0.0, 5.0, 4.0)
 pe.addForceGroup(fg)
-pe.enable()
 
 # Particle Panel
 pp = ParticlePanel.ParticlePanel(pe)
diff --git a/direct/src/particles/Particles.py b/direct/src/particles/Particles.py
index 8739c69eaf..82ba53b921 100644
--- a/direct/src/particles/Particles.py
+++ b/direct/src/particles/Particles.py
@@ -68,15 +68,17 @@ class Particles(ParticleSystem.ParticleSystem):
 
     def enable(self):
 	"""enable()"""
-	physicsMgr.attachPhysical(self)
-	particleMgr.attachParticlesystem(self)
-        self.fEnabled = 1
+	if (self.fEnabled == 0):
+	    physicsMgr.attachPhysical(self)
+	    particleMgr.attachParticlesystem(self)
+            self.fEnabled = 1
 
     def disable(self):
 	"""disable()"""
-	physicsMgr.removePhysical(self)
-	particleMgr.removeParticlesystem(self)
-        self.fEnabled = 0
+	if (self.fEnabled == 1):
+	    physicsMgr.removePhysical(self)
+	    particleMgr.removeParticlesystem(self)
+            self.fEnabled = 0
 
     def isEnabled(self):
         return self.fEnabled