mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-03 02:15:43 -04:00
Put some bullet proofing around cleanup and enable funcs
This commit is contained in:
parent
9c97466a56
commit
a3702b8a8f
@ -36,13 +36,17 @@ class ParticleEffect(NodePath):
|
|||||||
def cleanup(self):
|
def cleanup(self):
|
||||||
self.removeNode()
|
self.removeNode()
|
||||||
self.disable()
|
self.disable()
|
||||||
for f in self.forceGroupDict.values():
|
if hasattr(self, 'forceGroupDict'):
|
||||||
f.cleanup()
|
for f in self.forceGroupDict.values():
|
||||||
for p in self.particlesDict.values():
|
f.cleanup()
|
||||||
p.cleanup()
|
del self.forceGroupDict
|
||||||
|
if hasattr(self, 'particlesDict'):
|
||||||
|
for p in self.particlesDict.values():
|
||||||
|
p.cleanup()
|
||||||
|
del self.particlesDict
|
||||||
del self.renderParent
|
del self.renderParent
|
||||||
del self.particlesDict
|
|
||||||
del self.forceGroupDict
|
|
||||||
|
|
||||||
def reset(self):
|
def reset(self):
|
||||||
self.removeAllForces()
|
self.removeAllForces()
|
||||||
@ -52,14 +56,16 @@ class ParticleEffect(NodePath):
|
|||||||
|
|
||||||
def enable(self):
|
def enable(self):
|
||||||
"""enable()"""
|
"""enable()"""
|
||||||
if (self.renderParent != None):
|
# band-aid added for client crash - grw
|
||||||
|
if hasattr(self, 'forceGroupDict') and hasattr(self, 'particlesGroupDict'):
|
||||||
|
if (self.renderParent != None):
|
||||||
|
for p in self.particlesDict.values():
|
||||||
|
p.setRenderParent(self.renderParent.node())
|
||||||
|
for f in self.forceGroupDict.values():
|
||||||
|
f.enable()
|
||||||
for p in self.particlesDict.values():
|
for p in self.particlesDict.values():
|
||||||
p.setRenderParent(self.renderParent.node())
|
p.enable()
|
||||||
for f in self.forceGroupDict.values():
|
self.fEnabled = 1
|
||||||
f.enable()
|
|
||||||
for p in self.particlesDict.values():
|
|
||||||
p.enable()
|
|
||||||
self.fEnabled = 1
|
|
||||||
|
|
||||||
def disable(self):
|
def disable(self):
|
||||||
"""disable()"""
|
"""disable()"""
|
||||||
|
Loading…
x
Reference in New Issue
Block a user