From 209c96a791ec090fa0b510040d9370434bf5e6a8 Mon Sep 17 00:00:00 2001 From: Markus Lampert Date: Sun, 6 Oct 2019 22:13:07 -0700 Subject: [PATCH] Restrict loading of ocl and PathSurface to enabling experimental features. --- src/Mod/Path/InitGui.py | 1 + src/Mod/Path/PathScripts/PathGuiInit.py | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/Mod/Path/InitGui.py b/src/Mod/Path/InitGui.py index d774972f9b..b6a8b613c8 100644 --- a/src/Mod/Path/InitGui.py +++ b/src/Mod/Path/InitGui.py @@ -98,6 +98,7 @@ class PathWorkbench (Workbench): try: import ocl # pylint: disable=unused-variable + from PathScripts import PathSurfaceGui threedopcmdlist.append("Path_Surface") threedcmdgroup = ['Path_3dTools'] FreeCADGui.addCommand('Path_3dTools', PathCommandGroup(threedopcmdlist, QtCore.QT_TRANSLATE_NOOP("Path",'3D Operations'))) diff --git a/src/Mod/Path/PathScripts/PathGuiInit.py b/src/Mod/Path/PathScripts/PathGuiInit.py index 7ca84d5a1a..da66403398 100644 --- a/src/Mod/Path/PathScripts/PathGuiInit.py +++ b/src/Mod/Path/PathScripts/PathGuiInit.py @@ -68,12 +68,6 @@ def Startup(): from PathScripts import PathSimpleCopy from PathScripts import PathSimulatorGui from PathScripts import PathStop - try: - import ocl - from PathScripts import PathSurfaceGui - except ImportError: - import FreeCAD - FreeCAD.Console.PrintError("OpenCamLib is not working!\n") from PathScripts import PathToolController from PathScripts import PathToolControllerGui from PathScripts import PathToolLibraryManager