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

properly cleans up nametags

This commit is contained in:
Asad M. Zaman 2007-08-16 19:40:19 +00:00
parent bc488bb495
commit 82a863831c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
direct/src/actor/Actor.py
View File

@ -327,9 +327,15 @@ class Actor(DirectObject, NodePath):
# assign these elements to ourselve (overwrite)
self.assign(otherCopy)
else:
# just copy these to ourselve
# just copy these to ourselves
otherCopy = other.copyTo(self)
self.setGeomNode(otherCopy.getChild(0))
# masad: check if otherCopy has a geomNode as its first child
# if actor is initialized with flattenable, then otherCopy, not
# its first child, is the geom node; check __init__, for reference
if other.getGeomNode().getName() == other.getName():
self.setGeomNode(otherCopy)
else:
self.setGeomNode(otherCopy.getChild(0))
# copy the switches for lods
self.switches = other.switches