Set working plane immediately upon clicking the set working plane but…

…ton if you have a face selected
FreeCAD · May 20, 2019 · 2f14667 · 2f14667
1 parent d05feb2
commit 2f14667
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py
@@ -311,16 +311,16 @@ def GetResources(self):
     def Activated(self):
         DraftTool.Activated(self)
         self.offset = 0
-        if self.doc:
-
-            self.ui.selectPlaneUi()
-            FreeCAD.Console.PrintMessage(translate("draft", "Pick a face to define the drawing plane")+"\n")
-            if plane.alignToSelection(self.offset):
-                FreeCADGui.Selection.clearSelection()
-                self.display(plane.axis)
-                self.finish()
-            else:
-                self.call = self.view.addEventCallback("SoEvent", self.action)
+        if not self.doc:
+            return
+        self.ui.selectPlaneUi()
+        FreeCAD.Console.PrintMessage(translate("draft", "Pick a face to define the drawing plane")+"\n")
+        if plane.alignToSelection(self.offset):
+            FreeCADGui.Selection.clearSelection()
+            self.display(plane.axis)
+            self.finish()
+        else:
+            self.call = self.view.addEventCallback("SoEvent", self.action)
 
     def action(self, arg):
         if arg["Type"] == "SoKeyboardEvent" and arg["Key"] == "ESCAPE":

diff --git a/src/Mod/Draft/WorkingPlane.py b/src/Mod/Draft/WorkingPlane.py
@@ -269,7 +269,8 @@ def alignToSelection(self, offset):
         if len(sex) == 0:
             return False
         elif len(sex) == 1:
-            if not sex[0].Object.isDerivedFrom("Part::Shape"):
+            if not sex[0].Object.isDerivedFrom("Part::Feature") \
+                or not sex[0].Object.Shape:
                 return False
             return self.alignToCurve(sex[0].Object.Shape, offset) \
                 or self.alignToFace(sex[0].Object.Shape, offset) \