From bf3daf54a1ef8d233d59f325199c3338c231d0b5 Mon Sep 17 00:00:00 2001 From: Gyedo Jeon Date: Tue, 26 Jan 2010 01:20:15 +0000 Subject: [PATCH] Prohibited duplication in importing proto data --- direct/src/leveleditor/ProtoPaletteUI.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/direct/src/leveleditor/ProtoPaletteUI.py b/direct/src/leveleditor/ProtoPaletteUI.py index 4212eb5dc3..91039412fb 100755 --- a/direct/src/leveleditor/ProtoPaletteUI.py +++ b/direct/src/leveleditor/ProtoPaletteUI.py @@ -15,9 +15,14 @@ class FileDrop(wx.FileDropTarget): def OnDropFiles(self, x, y, filenames): for filename in filenames: name = os.path.basename(filename) + + if self.editor.protoPalette.findItem(name): + print 'This model already exists in ProtoPalette!' + return + modelname = Filename.fromOsSpecific(filename).getFullpath() itemData = ObjectBase(name=name, model=modelname, actor=True) - base.le.protoPalette.add(itemData) + self.editor.protoPalette.add(itemData) newItem = self.editor.ui.protoPaletteUI.tree.AppendItem(self.editor.ui.protoPaletteUI.root, name) self.editor.ui.protoPaletteUI.tree.SetItemPyData(newItem, itemData) self.editor.ui.protoPaletteUI.tree.ScrollTo(newItem)