Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code
This commit is contained in:
commit
38ca5341a6
|
@ -277,7 +277,9 @@ def findIntersection(edge1,edge2,infinite1=False,infinite2=False,ex1=False,ex2=F
|
|||
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:
|
||||
|
|
Loading…
Reference in New Issue
Block a user