[Bf-blender-cvs] [e63c773] master: Correct check when no path can be found
Campbell Barton
noreply at git.blender.org
Thu Jan 7 20:17:18 CET 2016
Commit: e63c773b7c7cc3cd4db1ee986942818f2a675c3e
Author: Campbell Barton
Date: Fri Jan 8 06:09:54 2016 +1100
Branches: master
https://developer.blender.org/rBe63c773b7c7cc3cd4db1ee986942818f2a675c3e
Correct check when no path can be found
===================================================================
M release/scripts/startup/bl_operators/bmesh/find_adjacent.py
===================================================================
diff --git a/release/scripts/startup/bl_operators/bmesh/find_adjacent.py b/release/scripts/startup/bl_operators/bmesh/find_adjacent.py
index bfe44ee..ad73849 100644
--- a/release/scripts/startup/bl_operators/bmesh/find_adjacent.py
+++ b/release/scripts/startup/bl_operators/bmesh/find_adjacent.py
@@ -179,17 +179,22 @@ def elems_depth_measure(ele_dst, ele_src, other_edges_over_cb):
stack_new[:] = []
depth += 1
- return [vert_depths[v] for v in ele_dst_verts]
+ if not all_dst:
+ return [vert_depths[v] for v in ele_dst_verts]
+ else:
+ return None
def find_next(ele_dst, ele_src):
depth_src_a = elems_depth_measure(ele_dst, ele_src, other_edges_over_edge)
depth_src_b = elems_depth_measure(ele_dst, ele_src, other_edges_over_face)
- depth_src = tuple(zip(depth_src_a, depth_src_b))
- if depth_src is None:
+ # path not found
+ if depth_src_a is None or depth_src_b is None:
return []
+ depth_src = tuple(zip(depth_src_a, depth_src_b))
+
candidates = elems_depth_search(ele_dst, depth_src_a, other_edges_over_edge)
candidates = elems_depth_search(ele_dst, depth_src_b, other_edges_over_face, candidates)
candidates.discard(ele_src)
More information about the Bf-blender-cvs
mailing list