blender
/
blender
134
399
Fork 581
Code Issues 6.3k Pull Requests 757 Projects 19 Wiki Activity

Editmesh: report a warning when fill fails 

also prevent assert with zero normal
This commit is contained in:
Campbell Barton 2014-11-05 14:19:14 +01:00
parent 2f87db681a
commit 67ec0ef277
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -183,7 +183,11 @@ void bmo_triangle_fill_exec(BMesh *bm, BMOperator *op)
calc_winding = false;
}
normalize_v3(normal);
/* in this case we almost certainly have degenerate geometry,
* better set a fallback value as a last resort */
if (UNLIKELY(normalize_v3(normal) == 0.0f)) {
normal[2] = 1.0f;
}
BLI_scanfill_calc_ex(&sf_ctx, scanfill_flag, normal);

32
source/blender/editors/mesh/editmesh_tools.c
View File

@ -2959,7 +2959,14 @@ static int edbm_fill_exec(bContext *C, wmOperator *op)
BMEditMesh *em = BKE_editmesh_from_object(obedit);
const bool use_beauty = RNA_boolean_get(op->ptr, "use_beauty");
BMOperator bmop;
const int totface_orig = em->bm->totface;
int ret;
if (em->bm->totedgesel == 0) {
BKE_report(op->reports, RPT_WARNING, "No edges selected");
return OPERATOR_CANCELLED;
}
if (!EDBM_op_init(em, &bmop, op,
"triangle_fill edges=%he use_beauty=%b",
BM_ELEM_SELECT, use_beauty))
@ -2969,17 +2976,24 @@ static int edbm_fill_exec(bContext *C, wmOperator *op)
BMO_op_exec(em->bm, &bmop);
/* select new geometry */
BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "geom.out", BM_FACE | BM_EDGE, BM_ELEM_SELECT, true);
if (!EDBM_op_finish(em, &bmop, op, true)) {
return OPERATOR_CANCELLED;
if (totface_orig != em->bm->totface) {
/* select new geometry */
BMO_slot_buffer_hflag_enable(em->bm, bmop.slots_out, "geom.out", BM_FACE | BM_EDGE, BM_ELEM_SELECT, true);
EDBM_update_generic(em, true, true);
ret = OPERATOR_FINISHED;
}
else {
BKE_report(op->reports, RPT_WARNING, "No faces filled");
ret = OPERATOR_CANCELLED;
}
EDBM_update_generic(em, true, true);
return OPERATOR_FINISHED;
if (!EDBM_op_finish(em, &bmop, op, true)) {
ret = OPERATOR_CANCELLED;
}
return ret;
}
void MESH_OT_fill(wmOperatorType *ot)