Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix edit-mesh select next

Browse Source 
Last change introduced error, return would stop looking over candidates.

D3137 by @nBurn
This commit is contained in:
Campbell Barton
2018-04-07 19:54:59 +02:00
parent 4db3b4da46
commit e0452cc5a9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
release/scripts/startup/bl_operators/bmesh/find_adjacent.py
View File

@@ -203,6 +203,7 @@ def find_next(ele_dst, ele_src):
candidates = elems_depth_search(ele_dst, depth_src_a, other_edges_over_edge) 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 = elems_depth_search(ele_dst, depth_src_b, other_edges_over_face, candidates)
candidates.discard(ele_src) candidates.discard(ele_src)
candidates.discard(ele_dst)
if not candidates: if not candidates:
return [] return []
@@ -218,7 +219,7 @@ def find_next(ele_dst, ele_src):
depth_test_a = elems_depth_measure(ele_dst, ele_test, other_edges_over_edge) depth_test_a = elems_depth_measure(ele_dst, ele_test, other_edges_over_edge)
depth_test_b = elems_depth_measure(ele_dst, ele_test, other_edges_over_face) depth_test_b = elems_depth_measure(ele_dst, ele_test, other_edges_over_face)
if depth_test_a is None or depth_test_b is None: if depth_test_a is None or depth_test_b is None:
return [] continue
depth_test = tuple(zip(depth_test_a, depth_test_b)) depth_test = tuple(zip(depth_test_a, depth_test_b))
# square so a few high values win over many small ones # square so a few high values win over many small ones
diff_test = sum((abs(a[0] - b[0]) ** 2) + diff_test = sum((abs(a[0] - b[0]) ** 2) +
@@ -242,7 +243,7 @@ def find_next(ele_dst, ele_src):
depth_test_a = elems_depth_measure(ele_src, ele_test, other_edges_over_edge) depth_test_a = elems_depth_measure(ele_src, ele_test, other_edges_over_edge)
depth_test_b = elems_depth_measure(ele_src, ele_test, other_edges_over_face) depth_test_b = elems_depth_measure(ele_src, ele_test, other_edges_over_face)
if depth_test_a is None or depth_test_b is None: if depth_test_a is None or depth_test_b is None:
return [] continue
depth_accum_test = ( depth_accum_test = (
sum(depth_test_a) + sum(depth_test_b)) sum(depth_test_a) + sum(depth_test_b))