Merge pull request #2157 from easyw/master

added try,except for OpenCamLib test on Path WB

src/Mod/Path/PathScripts/PathGuiInit.py

@@ -66,7 +66,13 @@ def Startup():
         from PathScripts import PathSimpleCopy
         from PathScripts import PathSimulatorGui
         from PathScripts import PathStop
-        from PathScripts import PathSurfaceGui
+        try:
+            import ocl
+            from PathScripts import PathSurfaceGui
+        except:
+            import FreeCAD
+            FreeCAD.Console.PrintError("OpenCamLib is not working!\n")
+            pass
         from PathScripts import PathToolController
         from PathScripts import PathToolLibraryManager
         Processed = True

src/Mod/Path/PathScripts/PathPreferences.py

@@ -164,5 +164,9 @@ def setDefaultTaskPanelLayout(style):
     preferences().SetInt(DefaultTaskPanelLayout, style)
 
 def experimentalFeaturesEnabled():
-    return preferences().GetBool(EnableExperimentalFeatures, False)
-
+    try:
+        import ocl
+        return preferences().GetBool(EnableExperimentalFeatures, False)
+    except:
+        FreeCAD.Console.PrintError("OpenCamLib is not working!\n")
+        return False