From 6981d75d56b56c8a5b15f587651afb85f3ac7c19 Mon Sep 17 00:00:00 2001 From: kreso-t Date: Fri, 24 Aug 2018 21:23:28 +0200 Subject: [PATCH] Fix for py3 import --- src/Mod/Path/PathScripts/PathAdaptiveGui.py | 2 +- src/Mod/Path/PathScripts/PathSelection.py | 16 +--------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/Mod/Path/PathScripts/PathAdaptiveGui.py b/src/Mod/Path/PathScripts/PathAdaptiveGui.py index 9c181b55be..523fc224ed 100644 --- a/src/Mod/Path/PathScripts/PathAdaptiveGui.py +++ b/src/Mod/Path/PathScripts/PathAdaptiveGui.py @@ -4,7 +4,7 @@ import PathScripts.PathLog as PathLog import PathScripts.PathGui as PathGui import PathScripts.PathOpGui as PathOpGui from PySide import QtCore, QtGui -import PathAdaptive +import PathScripts.PathAdaptive as PathAdaptive class TaskPanelOpPage(PathOpGui.TaskPanelPage): def initPage(self, obj): diff --git a/src/Mod/Path/PathScripts/PathSelection.py b/src/Mod/Path/PathScripts/PathSelection.py index d060520be2..dbaedc03e1 100644 --- a/src/Mod/Path/PathScripts/PathSelection.py +++ b/src/Mod/Path/PathScripts/PathSelection.py @@ -165,21 +165,7 @@ class ADAPTIVEGate: obj = obj.Shape except: return False - - if obj.ShapeType == 'Edge': - adaptive = True - - elif obj.ShapeType == 'Face': - adaptive = True - - elif obj.ShapeType == 'Solid': - if sub and sub[0:4] == 'Face': - adaptive = True - - elif obj.ShapeType == 'Compound': - if sub and sub[0:4] == 'Face': - adaptive = True - + return adaptive class CONTOURGate: