Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-04-05 19:45:25 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-04-05 19:48:48 +0300
commiteb7b70113770395a6b94d86709d5cc416cbed4ed (patch)
treeca4067800ecd09dda40a1be372c6d82997e52b8b
parent58ba5a65bc512b75d876c40ef6e978359166f45a (diff)
Fix error where find-next missed None check
Thanks to @nBurn
-rw-r--r--release/scripts/startup/bl_operators/bmesh/find_adjacent.py9
1 files changed, 7 insertions, 2 deletions
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