griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.5-release'

Browse Source
This commit is contained in:
Campbell Barton
2025-06-07 12:40:42 +10:00
parent 11b21a5993 bfbc9c804c
commit ff845ebfc3
1 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
source/blender/bmesh/operators/bmo_dissolve.cc
View File

@@ -355,6 +355,25 @@ void bmo_dissolve_faces_exec(BMesh *bm, BMOperator *op)
BMO_slot_buffer_from_enabled_flag(bm, op, op->slots_out, "region.out", BM_FACE, FACE_NEW);
}
/**
* Given an edge, and vert that are part of a chain, finds the vert at the far end of the chain.
*/
static BMVert *bmo_find_end_of_chain(BMEdge *e, BMVert *v)
{
BMVert *v_init = v;
while (BM_vert_is_edge_pair(v)) {
e = BM_DISK_EDGE_NEXT(e, v);
v = BM_edge_other_vert(e, v);
/* While this should never happen in the context this function is called.
* Avoid an eternal loop even in the case of degenerate geometry. */
BLI_assert(v != v_init);
if (UNLIKELY(v == v_init)) {
break;
}
}
return v;
}
void bmo_dissolve_edges_exec(BMesh *bm, BMOperator *op)
{
// BMOperator fop;
@@ -441,6 +460,21 @@ void bmo_dissolve_edges_exec(BMesh *bm, BMOperator *op)
BMO_ITER (e, &eiter, op->slots_in, "edges", BM_EDGE) {
BMLoop *l_a, *l_b;
if (BM_edge_loop_pair(e, &l_a, &l_b)) {
/* When #VERT_MARK is set on a vert in the middle of a chain, the flag needs to be moved to
* the end of the chain, because when all the chain edges between the two faces get cleaned
* up as part of #BM_faces_join_pair, the flagged vert would otherwise be lost.
* Find the end of the chain, where the dissolve test should be done, move the flag there. */
for (int i = 0; i < 2; i++) {
BMVert *v_edge = *((&e->v1) + i);
if (BMO_vert_flag_test(bm, v_edge, VERT_MARK)) {
BMVert *v_edge_chain_end = bmo_find_end_of_chain(e, v_edge);
if (v_edge != v_edge_chain_end) {
BMO_vert_flag_enable(bm, v_edge_chain_end, VERT_MARK);
}
}
}
BM_faces_join_pair(bm, l_a, l_b, false, nullptr);
}
}