TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added holiday props

Browse Source
This commit is contained in:
Mark Mine 2005-01-05 02:15:38 +00:00
parent 0fce12f1d5
commit 06413d98ac
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
direct/src/leveleditor/LevelEditor.py
View File

@ -4020,7 +4020,7 @@ class LevelStyleManager:
(dnaType == 'toon_landmark')): (dnaType == 'toon_landmark')):
dnaList = self.getCatalogCodes(dnaType) dnaList = self.getCatalogCodes(dnaType)
if dnaType == 'prop': if dnaType == 'prop':
dnaList.append(self.getCatalogCodes('holiday_prop')) dnaList = dnaList + self.getCatalogCodes('holiday_prop')
elif (dnaType == 'sign'): elif (dnaType == 'sign'):
dnaList = [''] + self.getCatalogCodes(dnaType) dnaList = [''] + self.getCatalogCodes(dnaType)
elif (dnaType == 'wall'): elif (dnaType == 'wall'):
@ -5037,7 +5037,8 @@ class LevelEditorPanel(Pmw.MegaToplevel):
text = 'ADD PROP', text = 'ADD PROP',
command = self.addProp) command = self.addProp)
self.addPropsButton.pack(fill = X, padx = 20, pady = 10) self.addPropsButton.pack(fill = X, padx = 20, pady = 10)
codes = self.styleManager.getCatalogCodes('prop') codes = (self.styleManager.getCatalogCodes('prop') +
self.styleManager.getCatalogCodes('holiday_prop'))
codes.sort() codes.sort()
self.propSelector = Pmw.ComboBox( self.propSelector = Pmw.ComboBox(
propsPage, propsPage,