浏览代码

Made ObjGen type object not be created

Gyedo Jeon 15 年之前
父节点
当前提交
d69d9961f8
共有 2 个文件被更改,包括 5 次插入0 次删除
  1. 3 0
      direct/src/leveleditor/LevelEditorUIBase.py
  2. 2 0
      direct/src/leveleditor/ObjectMgrBase.py

+ 3 - 0
direct/src/leveleditor/LevelEditorUIBase.py

@@ -26,6 +26,8 @@ class PandaTextDropTarget(wx.TextDropTarget):
         action = ActionAddNewObj(self.editor, text)
         self.editor.actionMgr.push(action)
         newobj = action()
+        if newobj is None:
+            return
 
         # change window coordinate to mouse coordinate
         mx = 2 * (x/float(self.view.ClientSize.GetWidth()) - 0.5)
@@ -284,6 +286,7 @@ class LevelEditorUIBase(WxAppShell):
             mpos = self.ScreenToClient((mpos.x, mpos.y))
         else:
             mpos = evt.GetPosition()
+
         base.direct.fMouse3 = 0
         self.PopupMenu(self.contextMenu, mpos)
 

+ 2 - 0
direct/src/leveleditor/ObjectMgrBase.py

@@ -80,6 +80,8 @@ class ObjectMgrBase:
                 objDef = base.protoPalette.findItem(typeName)
         newobj = None
         if objDef and type(objDef) != dict:
+            if not hasattr(objDef, 'createFunction'):
+                return newobj
             if nodePath is None:
                 if objDef.createFunction:
                     funcName = objDef.createFunction[OG.FUNC_NAME]