From 06413d98ac30ff030fe1d70327e0cc6e2344a02e Mon Sep 17 00:00:00 2001 From: Mark Mine Date: Wed, 5 Jan 2005 02:15:38 +0000 Subject: [PATCH] Added holiday props --- direct/src/leveleditor/LevelEditor.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/direct/src/leveleditor/LevelEditor.py b/direct/src/leveleditor/LevelEditor.py index f5a68fa3de..8a6c453e8e 100644 --- a/direct/src/leveleditor/LevelEditor.py +++ b/direct/src/leveleditor/LevelEditor.py @@ -4020,7 +4020,7 @@ class LevelStyleManager: (dnaType == 'toon_landmark')): dnaList = self.getCatalogCodes(dnaType) if dnaType == 'prop': - dnaList.append(self.getCatalogCodes('holiday_prop')) + dnaList = dnaList + self.getCatalogCodes('holiday_prop') elif (dnaType == 'sign'): dnaList = [''] + self.getCatalogCodes(dnaType) elif (dnaType == 'wall'): @@ -5037,7 +5037,8 @@ class LevelEditorPanel(Pmw.MegaToplevel): text = 'ADD PROP', command = self.addProp) 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() self.propSelector = Pmw.ComboBox( propsPage,