From 17e3f3331ce6bbc5406912f48a93bdf8ad39abc3 Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 22 Feb 2023 23:49:15 +0100 Subject: [PATCH] directtools: Import cluster code only on demand This prevents importing directtools modules also importing cluster code, which may fail to import with Panda builds that have net code disabled --- direct/src/directtools/DirectSession.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/direct/src/directtools/DirectSession.py b/direct/src/directtools/DirectSession.py index 0fddd6fa9b..2947b29088 100644 --- a/direct/src/directtools/DirectSession.py +++ b/direct/src/directtools/DirectSession.py @@ -28,8 +28,6 @@ from .DirectSelection import SelectionRay, COA_ORIGIN, SelectedNodePaths from .DirectGrid import DirectGrid #from DirectGeometry import * from .DirectLights import DirectLights -from direct.cluster.ClusterClient import createClusterClient, DummyClusterClient -from direct.cluster.ClusterServer import ClusterServer ## from direct.tkpanels import Placer ## from direct.tkwidgets import Slider ## from direct.tkwidgets import SceneGraphExplorer @@ -319,10 +317,13 @@ class DirectSession(DirectObject): self.clusterMode = ConfigVariableString("cluster-mode", '').value if self.clusterMode == 'client': + from direct.cluster.ClusterClient import createClusterClient self.cluster = createClusterClient() elif self.clusterMode == 'server': + from direct.cluster.ClusterServer import ClusterServer self.cluster = ClusterServer(base.camera, base.cam) else: + from direct.cluster.ClusterClient import DummyClusterClient self.cluster = DummyClusterClient() __builtins__['cluster'] = self.cluster