From e83301cdeac2dae53fe8e105b5f4730d4d078b67 Mon Sep 17 00:00:00 2001 From: Josh Wilson Date: Thu, 17 Nov 2005 00:43:40 +0000 Subject: [PATCH] Fixed a rare bug that occurs when adding an animation or texture to the spriteRenderer --- direct/src/tkpanels/ParticlePanel.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/direct/src/tkpanels/ParticlePanel.py b/direct/src/tkpanels/ParticlePanel.py index c04233c2b1..25941dfc9d 100644 --- a/direct/src/tkpanels/ParticlePanel.py +++ b/direct/src/tkpanels/ParticlePanel.py @@ -1813,14 +1813,19 @@ class ParticlePanel(AppShell): if ren.addTextureFromFile(): animId = len([x for x in self.rendererSpriteAnimationWidgetList if x and x.valid]) anim = ren.getAnim(animId) - + + frameNum = len([x for x in self.rendererSpriteAnimationWidgetList if x]) + self.rendererSpriteAnimationWidgetList.append( - self.createSpriteAnimationTextureWidget(parent,anim,`animId`)) + self.createSpriteAnimationTextureWidget(parent,anim,`frameNum`)) else: animId = len([x for x in self.rendererSpriteAnimationWidgetList if x and x.valid]) anim = SpriteAnim.STTexture + + frameNum = len([x for x in self.rendererSpriteAnimationWidgetList if x]) + self.rendererSpriteAnimationWidgetList.append( - self.createSpriteAnimationTextureWidget(parent,anim,`animId`)) + self.createSpriteAnimationTextureWidget(parent,anim,`frameNum`)) parent.pack(fill=BOTH, expand=1) def addRendererSpriteAnimationFromNode(self): ren = self.particles.getRenderer() @@ -1829,14 +1834,19 @@ class ParticlePanel(AppShell): if ren.addTextureFromNode(): animId = len([x for x in self.rendererSpriteAnimationWidgetList if x and x.valid]) anim = ren.getAnim(animId) + + frameNum = len([x for x in self.rendererSpriteAnimationWidgetList if x]) self.rendererSpriteAnimationWidgetList.append( - self.createSpriteAnimationNodeWidget(parent,anim,`animId`)) + self.createSpriteAnimationNodeWidget(parent,anim,`frameNum`)) else: animId = len([x for x in self.rendererSpriteAnimationWidgetList if x and x.valid]) anim = SpriteAnim.STFromNode + + frameNum = len([x for x in self.rendererSpriteAnimationWidgetList if x]) + self.rendererSpriteAnimationWidgetList.append( - self.createSpriteAnimationNodeWidget(parent,anim,`animId`)) + self.createSpriteAnimationNodeWidget(parent,anim,`frameNum`)) parent.pack(fill=BOTH, expand=1) def toggleRendererSpriteXScale(self):