From 0a622d08e92f5e8ea9f9736fce973161baaba759 Mon Sep 17 00:00:00 2001 From: rdb Date: Tue, 29 Oct 2019 14:57:04 +0100 Subject: [PATCH] direct: fix a few broken imports --- direct/src/controls/InputState.py | 3 +-- direct/src/directdevices/DirectFastrak.py | 4 ++-- direct/src/leveleditor/ActionMgr.py | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/direct/src/controls/InputState.py b/direct/src/controls/InputState.py index 68608e9bea..2fe21fc80f 100755 --- a/direct/src/controls/InputState.py +++ b/direct/src/controls/InputState.py @@ -1,7 +1,6 @@ - - from direct.directnotify import DirectNotifyGlobal from direct.showbase import DirectObject +from direct.showbase.PythonUtil import SerialNumGen # internal class, don't create these on your own class InputStateToken: diff --git a/direct/src/directdevices/DirectFastrak.py b/direct/src/directdevices/DirectFastrak.py index c6e30bd8fc..adc275ca0b 100644 --- a/direct/src/directdevices/DirectFastrak.py +++ b/direct/src/directdevices/DirectFastrak.py @@ -20,9 +20,9 @@ class DirectFastrak(DirectObject): fastrakCount = 0 notify = DirectNotifyGlobal.directNotify.newCategory('DirectFastrak') - def __init__(self, device = 'Tracker0', nodePath = base.direct.camera): + def __init__(self, device = 'Tracker0', nodePath = None): # See if device manager has been initialized - if base.direct.deviceManager == None: + if base.direct.deviceManager is None: base.direct.deviceManager = DirectDeviceManager() # Set name diff --git a/direct/src/leveleditor/ActionMgr.py b/direct/src/leveleditor/ActionMgr.py index 29d9ba3742..54bb733c4c 100755 --- a/direct/src/leveleditor/ActionMgr.py +++ b/direct/src/leveleditor/ActionMgr.py @@ -1,4 +1,5 @@ from pandac.PandaModules import * +from direct.showbase.PythonUtil import Functor from . import ObjectGlobals as OG class ActionMgr: