[Bf-blender-cvs] [eb7b7011377] master: Fix error where find-next missed None check
Campbell Barton
noreply at git.blender.org
Thu Apr 5 18:49:59 CEST 2018
Commit: eb7b70113770395a6b94d86709d5cc416cbed4ed
Author: Campbell Barton
Date: Thu Apr 5 18:45:25 2018 +0200
Branches: master
https://developer.blender.org/rBeb7b70113770395a6b94d86709d5cc416cbed4ed
Fix error where find-next missed None check
Thanks to @nBurn
===================================================================
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 686392823f1..80de10924fd 100644
--- a/release/scripts/startup/bl_operators/bmesh/find_adjacent.py
+++ b/release/scripts/startup/bl_operators/bmesh/find_adjacent.py
@@ -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
More information about the Bf-blender-cvs
mailing list