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

add dissolve option to triangle fill operator, running dissolve after scanfill isn't so simple because of errors if one edge can't merge.

Browse Source
This commit is contained in:
Campbell Barton
2013-08-23 11:10:46 +00:00
parent 59b082dc27
commit 98bb2197a2
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/bmesh/intern/bmesh_opdefines.c
View File

@@ -1597,6 +1597,7 @@ static BMOpDefine bmo_triangle_fill_def = {
"triangle_fill",
/* slots_in */
{{"use_beauty", BMO_OP_SLOT_BOOL},
{"use_dissolve", BMO_OP_SLOT_BOOL}, /* dissolve resulting faces */
{"edges", BMO_OP_SLOT_ELEMENT_BUF, {BM_EDGE}}, /* input edges */
{"normal", BMO_OP_SLOT_VEC}, /* optionally pass the fill normal to use */
{{'\0'}},

19
source/blender/bmesh/operators/bmo_triangulate.c
View File

@@ -59,6 +59,7 @@ void bmo_triangulate_exec(BMesh *bm, BMOperator *op)
void bmo_triangle_fill_exec(BMesh *bm, BMOperator *op)
{
const bool use_beauty = BMO_slot_bool_get(op->slots_in, "use_beauty");
const bool use_dissolve = BMO_slot_bool_get(op->slots_in, "use_dissolve");
BMOIter siter;
BMEdge *e;
ScanFillContext sf_ctx;
@@ -133,4 +134,22 @@ void bmo_triangle_fill_exec(BMesh *bm, BMOperator *op)
}
BMO_slot_buffer_from_enabled_flag(bm, op, op->slots_out, "geom.out", BM_EDGE | BM_FACE, ELE_NEW);
if (use_dissolve) {
BMO_ITER (e, &siter, op->slots_out, "geom.out", BM_EDGE) {
BMFace *f_new;
f_new = BM_faces_join_pair(bm, e->l->f,
e->l->radial_next->f, e,
false); /* join faces */
if (f_new) {
BMO_elem_flag_enable(bm, f_new, ELE_NEW);
BM_edge_kill(bm, e);
}
else {
BMO_error_clear(bm);
}
}
BMO_slot_buffer_from_enabled_flag(bm, op, op->slots_out, "geom.out", BM_EDGE | BM_FACE, ELE_NEW);
}
}