[Bf-blender-cvs] [6483575] master: Fix error with intersect handling split-wire edges
Campbell Barton
noreply at git.blender.org
Thu Nov 26 03:25:25 CET 2015
Commit: 6483575b35abcca1360a1110210bf19047dd5d2e
Author: Campbell Barton
Date: Thu Nov 26 12:11:50 2015 +1100
Branches: master
https://developer.blender.org/rB6483575b35abcca1360a1110210bf19047dd5d2e
Fix error with intersect handling split-wire edges
===================================================================
M source/blender/bmesh/tools/bmesh_intersect.c
===================================================================
diff --git a/source/blender/bmesh/tools/bmesh_intersect.c b/source/blender/bmesh/tools/bmesh_intersect.c
index 19cf2d2..24f7fe2 100644
--- a/source/blender/bmesh/tools/bmesh_intersect.c
+++ b/source/blender/bmesh/tools/bmesh_intersect.c
@@ -999,7 +999,8 @@ bool BM_mesh_intersect(
const float fac = line_point_factor_v3(vi->co, e->v1->co, e->v2->co);
if (BM_vert_in_edge(e, v_prev)) {
- v_prev = BM_edge_split(bm, e, v_prev, NULL, CLAMPIS(fac, 0.0f, 1.0f));
+ BMEdge *e_split;
+ v_prev = BM_edge_split(bm, e, v_prev, &e_split, CLAMPIS(fac, 0.0f, 1.0f));
BLI_assert(BM_vert_in_edge(e, v_end));
if (!BM_edge_exists(v_prev, vi) &&
@@ -1013,7 +1014,7 @@ bool BM_mesh_intersect(
}
v_prev = vi;
if (is_wire) {
- BLI_gset_insert(s.wire_edges, e);
+ BLI_gset_insert(s.wire_edges, e_split);
}
}
}
More information about the Bf-blender-cvs
mailing list