From 46ffa77c32f27e87e788ba7241dff856697fb7e7 Mon Sep 17 00:00:00 2001 From: Dion Moult Date: Tue, 29 Jan 2019 22:11:31 +1100 Subject: [PATCH] I think being explicit is clearer, and prevents the liklihood of random falsy values --- src/Mod/Draft/Draft.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py index 9a863d56a3..8d805bf437 100644 --- a/src/Mod/Draft/Draft.py +++ b/src/Mod/Draft/Draft.py @@ -1349,7 +1349,7 @@ def joinWires(wires, joinAttempts = 0): for wire2Index, wire2 in enumerate(wires): if wire2Index <= wire1Index: continue - if not joinTwoWires(wire1, wire2): + if joinTwoWires(wire1, wire2): wires.pop(wire2Index) break joinWires(wires, joinAttempts) @@ -1373,6 +1373,7 @@ def joinTwoWires(wire1, wire2): wire2AbsPoints.pop(0) wire1.Points = [wire1.Placement.inverse().multVec(point) for point in wire1AbsPoints] + [wire1.Placement.inverse().multVec(point) for point in wire2AbsPoints] FreeCAD.ActiveDocument.removeObject(wire2.Name) + return True def fuse(object1,object2): '''fuse(oject1,object2): returns an object made from