From 4f548889a863677bac5271ff07b6c95393353a67 Mon Sep 17 00:00:00 2001 From: Kyle Smith Date: Sun, 6 Jan 2019 16:15:51 +1000 Subject: [PATCH] leveleditor: Use panda3d.core --- direct/src/leveleditor/ActionMgr.py | 2 +- direct/src/leveleditor/CurveEditor.py | 2 +- direct/src/leveleditor/FileMgr.py | 2 +- direct/src/leveleditor/LayerEditorUI.py | 2 +- direct/src/leveleditor/LevelEditorUIBase.py | 2 +- direct/src/leveleditor/ObjectMgrBase.py | 2 +- direct/src/leveleditor/ObjectPropertyUI.py | 2 +- direct/src/leveleditor/ProtoObjsUI.py | 2 +- direct/src/leveleditor/ProtoPaletteUI.py | 2 +- direct/src/leveleditor/SceneGraphUIBase.py | 2 +- direct/src/leveleditor/testData.py | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/direct/src/leveleditor/ActionMgr.py b/direct/src/leveleditor/ActionMgr.py index 29d9ba3742..dcc5b7ff91 100755 --- a/direct/src/leveleditor/ActionMgr.py +++ b/direct/src/leveleditor/ActionMgr.py @@ -1,4 +1,4 @@ -from pandac.PandaModules import * +from panda3d.core import * from . import ObjectGlobals as OG class ActionMgr: diff --git a/direct/src/leveleditor/CurveEditor.py b/direct/src/leveleditor/CurveEditor.py index b1acc04525..57cc119378 100755 --- a/direct/src/leveleditor/CurveEditor.py +++ b/direct/src/leveleditor/CurveEditor.py @@ -2,7 +2,7 @@ This is the module for curve edit """ -from pandac.PandaModules import * +from panda3d.core import * from direct.wxwidgets.WxPandaShell import * from direct.showbase.DirectObject import * from direct.directtools.DirectSelection import SelectionRay diff --git a/direct/src/leveleditor/FileMgr.py b/direct/src/leveleditor/FileMgr.py index a0b00d1a04..1f11dc7133 100755 --- a/direct/src/leveleditor/FileMgr.py +++ b/direct/src/leveleditor/FileMgr.py @@ -11,7 +11,7 @@ class FileMgr: def saveToFile(self, fileName): try: f = open(fileName, 'w') - f.write("from pandac.PandaModules import *\n") + f.write("from panda3d.core import *\n") f.write("\nif hasattr(base, 'le'):\n") f.write(" objectMgr = base.le.objectMgr\n") f.write(" animMgr = base.le.animMgr\n") diff --git a/direct/src/leveleditor/LayerEditorUI.py b/direct/src/leveleditor/LayerEditorUI.py index d77f8779bb..e30dc343b4 100644 --- a/direct/src/leveleditor/LayerEditorUI.py +++ b/direct/src/leveleditor/LayerEditorUI.py @@ -2,7 +2,7 @@ Defines Layer UI """ import wx -from pandac.PandaModules import * +from panda3d.core import * from . import ObjectGlobals as OG diff --git a/direct/src/leveleditor/LevelEditorUIBase.py b/direct/src/leveleditor/LevelEditorUIBase.py index f457f838d6..159ec58f36 100755 --- a/direct/src/leveleditor/LevelEditorUIBase.py +++ b/direct/src/leveleditor/LevelEditorUIBase.py @@ -2,7 +2,7 @@ ## import os ## from wx.lib.agw import fourwaysplitter as FWS -from pandac.PandaModules import * +from panda3d.core import * from direct.wxwidgets.WxPandaShell import * from direct.directtools.DirectSelection import SelectionRay diff --git a/direct/src/leveleditor/ObjectMgrBase.py b/direct/src/leveleditor/ObjectMgrBase.py index 3a65d6a998..2e9cc2a17c 100755 --- a/direct/src/leveleditor/ObjectMgrBase.py +++ b/direct/src/leveleditor/ObjectMgrBase.py @@ -6,7 +6,7 @@ import os, time, copy from direct.task import Task from direct.actor.Actor import Actor -from pandac.PandaModules import * +from panda3d.core import * from .ActionMgr import * from . import ObjectGlobals as OG diff --git a/direct/src/leveleditor/ObjectPropertyUI.py b/direct/src/leveleditor/ObjectPropertyUI.py index 08adb8b784..4b76cb8879 100755 --- a/direct/src/leveleditor/ObjectPropertyUI.py +++ b/direct/src/leveleditor/ObjectPropertyUI.py @@ -9,7 +9,7 @@ from wx.lib.embeddedimage import PyEmbeddedImage from wx.lib.scrolledpanel import ScrolledPanel from wx.lib.agw.cubecolourdialog import * from direct.wxwidgets.WxSlider import * -from pandac.PandaModules import * +from panda3d.core import * from . import ObjectGlobals as OG from . import AnimGlobals as AG diff --git a/direct/src/leveleditor/ProtoObjsUI.py b/direct/src/leveleditor/ProtoObjsUI.py index 63222e3a2d..a4e09af9f3 100755 --- a/direct/src/leveleditor/ProtoObjsUI.py +++ b/direct/src/leveleditor/ProtoObjsUI.py @@ -4,7 +4,7 @@ Defines ProtoObjs List UI import wx import os -from pandac.PandaModules import * +from panda3d.core import * from .ProtoObjs import * class ProtoDropTarget(wx.PyDropTarget): diff --git a/direct/src/leveleditor/ProtoPaletteUI.py b/direct/src/leveleditor/ProtoPaletteUI.py index d9f047b55f..51d26e8474 100755 --- a/direct/src/leveleditor/ProtoPaletteUI.py +++ b/direct/src/leveleditor/ProtoPaletteUI.py @@ -3,7 +3,7 @@ Defines ProtoPalette tree UI """ import wx import os -from pandac.PandaModules import * +from panda3d.core import * from .PaletteTreeCtrl import * class UniversalDropTarget(wx.PyDropTarget): diff --git a/direct/src/leveleditor/SceneGraphUIBase.py b/direct/src/leveleditor/SceneGraphUIBase.py index c98cf8505c..74afd6a585 100755 --- a/direct/src/leveleditor/SceneGraphUIBase.py +++ b/direct/src/leveleditor/SceneGraphUIBase.py @@ -2,7 +2,7 @@ Defines Scene Graph tree UI Base """ import wx -from pandac.PandaModules import * +from panda3d.core import * from .ActionMgr import * from . import ObjectGlobals as OG diff --git a/direct/src/leveleditor/testData.py b/direct/src/leveleditor/testData.py index 28d4a04d1c..d35c01b103 100755 --- a/direct/src/leveleditor/testData.py +++ b/direct/src/leveleditor/testData.py @@ -1,4 +1,4 @@ -from pandac.PandaModules import * +from panda3d.core import * if hasattr(base, 'le'): objectMgr = base.le.objectMgr