RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed a rare bug that occurs when adding an animation or texture to the spriteRenderer

This commit is contained in:
Josh Wilson 2005-11-17 00:43:40 +00:00
parent cae26e2b52
commit e83301cdea
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
direct/src/tkpanels/ParticlePanel.py
View File

@ -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):