From 50e0952b6b2b9cb4f54b4e49e3ae0ef357b5fe88 Mon Sep 17 00:00:00 2001 From: Mark Mine Date: Wed, 31 Jan 2001 22:10:26 +0000 Subject: [PATCH] *** empty log message *** --- direct/src/leveleditor/LevelEditor.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/direct/src/leveleditor/LevelEditor.py b/direct/src/leveleditor/LevelEditor.py index 4004843575..460c6b90d0 100644 --- a/direct/src/leveleditor/LevelEditor.py +++ b/direct/src/leveleditor/LevelEditor.py @@ -866,7 +866,7 @@ class LevelEditor(NodePath, PandaObject): # If nothing selected, just return if not self.selectedNPRoot: return - + # Next check to see if the selected object is a DNA object dnaObject = self.findDNANode(self.selectedNPRoot) # Nope, not a DNA object, just return @@ -877,6 +877,9 @@ class LevelEditor(NodePath, PandaObject): if DNAClassEqual(dnaObject, DNA_FLAT_BUILDING): # FLAT BUILDING OPERATIONS menuMode, wallNum = self.getFlatBuildingMode(dnaObject) + # Check menuMode + if menuMode == None: + return # Find appropriate target wall = self.getWall(dnaObject, wallNum) # Record bldg/wall @@ -917,11 +920,11 @@ class LevelEditor(NodePath, PandaObject): # STREET OPERATIONS self.DNATarget = dnaObject menuMode = 'street_texture' - + # No valid menu mode, get the hell out of here! if menuMode == None: return - + # Now spawn apropriate menu task if menu selected self.activeMenu = self.getMenu(menuMode) # Set initial state @@ -1000,6 +1003,8 @@ class LevelEditor(NodePath, PandaObject): menuMode = 'door_orientation' else: menuMode = 'door_texture' + # MRM: Temp for now + menuMode = None else: # Do window operations if direct.fControl: