[Bf-blender-cvs] [9291558b63f] master: bmesh_intersect_edges: Fix asserts
mano-wii
noreply at git.blender.org
Mon Jan 27 21:43:46 CET 2020
Commit: 9291558b63fb5f0abae5370cfbac4e28f6035491
Author: mano-wii
Date: Mon Jan 27 17:29:05 2020 -0300
Branches: master
https://developer.blender.org/rB9291558b63fb5f0abae5370cfbac4e28f6035491
bmesh_intersect_edges: Fix asserts
===================================================================
M source/blender/bmesh/tools/bmesh_intersect_edges.c
===================================================================
diff --git a/source/blender/bmesh/tools/bmesh_intersect_edges.c b/source/blender/bmesh/tools/bmesh_intersect_edges.c
index b25dc82aac9..0f9bc68afeb 100644
--- a/source/blender/bmesh/tools/bmesh_intersect_edges.c
+++ b/source/blender/bmesh/tools/bmesh_intersect_edges.c
@@ -145,6 +145,8 @@ static BMFace *bm_vert_pair_best_face_get(
{
BMFace *r_best_face = NULL;
+ BLI_assert(v_a != v_b);
+
BMLoop *dummy;
if (edgenet_len == 1) {
float data[2][3];
@@ -636,7 +638,7 @@ bool BM_mesh_intersect_edges(
BLI_bvhtree_insert(tree_edges_act, i, co[0], 2);
}
else if (edge_test == EDGE_REMAIN_TO_TEST) {
- BLI_assert(tree_edges_act);
+ BLI_assert(tree_edges_remain);
e->head.index = 0;
copy_v3_v3(co[0], e->v1->co);
copy_v3_v3(co[1], e->v2->co);
More information about the Bf-blender-cvs
mailing list