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

Fix error where find-next missed None check

Browse Source 
Thanks to @nBurn
This commit is contained in:
Campbell Barton
2018-04-05 18:45:25 +02:00
parent 58ba5a65bc
commit eb7b701137
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -217,6 +217,8 @@ def find_next(ele_dst, ele_src):
for ele_test in candidates:
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)
if depth_test_a is None or depth_test_b is None:
return []
depth_test = tuple(zip(depth_test_a, depth_test_b))
# square so a few high values win over many small ones
diff_test = sum((abs(a[0] - b[0]) ** 2) +
@@ -237,9 +239,12 @@ def find_next(ele_dst, ele_src):
ele_best_ls = []
depth_accum_max = -1
for ele_test in ele_best_ls_init:
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)
if depth_test_a is None or depth_test_b is None:
return []
depth_accum_test = (
sum(elems_depth_measure(ele_src, ele_test, other_edges_over_edge)) +
sum(elems_depth_measure(ele_src, ele_test, other_edges_over_face)))
sum(depth_test_a) + sum(depth_test_b))
if depth_accum_test > depth_accum_max:
depth_accum_max = depth_accum_test