Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code

FreeCAD · Apr 14, 2015 · 38ca534 · 38ca534
2 parents 0c1fb8e + 7ddd9d2
commit 38ca534
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/Mod/Draft/DraftGeomUtils.py b/src/Mod/Draft/DraftGeomUtils.py
@@ -277,7 +277,9 @@ def getLineIntersections(pt1,pt2,pt3,pt4,infinite1,infinite2):
             return [] # Lines aren't on same plane
 
     # First, try to use distToShape if possible
-    if dts and isinstance(edge1,Part.Edge) and isinstance(edge2,Part.Edge) and (not infinite1) and (not infinite2):
+    if dts and isinstance(edge1,Part.Edge) and isinstance(edge2,Part.Edge) \
+            and (not infinite1) and (not infinite2) and \
+            edge1.BoundBox.isIntersection(edge2.BoundBox):
         dist, pts, geom = edge1.distToShape(edge2)
         sol = []
         for p in pts: