[Bf-blender-cvs] [67ec0ef] master: Editmesh: report a warning when fill fails

[Campbell Barton]

Commit: 67ec0ef277d862ff69ff667566502045c1b93493
Author: Campbell Barton
Date:   Wed Nov 5 14:19:14 2014 +0100
Branches: master
https://developer.blender.org/rB67ec0ef277d862ff69ff667566502045c1b93493

Editmesh: report a warning when fill fails

also prevent assert with zero normal

===================================================================

M       source/blender/bmesh/operators/bmo_triangulate.c
M       source/blender/editors/mesh/editmesh_tools.c

===================================================================

diff --git a/source/blender/bmesh/operators/bmo_triangulate.c 
b/source/blender/bmesh/operators/bmo_triangulate.c
index 5e25f57..cb9ba5e 100644
--- a/source/blender/bmesh/operators/bmo_triangulate.c
+++ b/source/blender/bmesh/operators/bmo_triangulate.c
@@ -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);
 
diff --git a/source/blender/editors/mesh/editmesh_tools.c 
b/source/blender/editors/mesh/editmesh_tools.c
index db8c939..15b782f 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -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)

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs