Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2012-02-20 00:29:04 +0400
committerThomas Dinges <blender@dingto.org>2012-02-20 00:29:04 +0400
commit56e41a3ef0a3b80862018753cc4c3ac7247e82b0 (patch)
tree4398dc46dcf2084ca318f9f6286831edec68b343
parent0fd176e03d0f6b0c6e4211c0a29eafa8309c4b8b (diff)
B-Mesh:
* Remove Doubles was missing the info how many vertices were removed, added that back.
-rw-r--r--source/blender/editors/mesh/bmesh_tools.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/source/blender/editors/mesh/bmesh_tools.c b/source/blender/editors/mesh/bmesh_tools.c
index cffc001b8d2..f97a8e1b9a9 100644
--- a/source/blender/editors/mesh/bmesh_tools.c
+++ b/source/blender/editors/mesh/bmesh_tools.c
@@ -2195,13 +2195,13 @@ static int removedoublesflag_exec(bContext *C, wmOperator *op)
Object *obedit = CTX_data_edit_object(C);
BMEditMesh *em = ((Mesh *)obedit->data)->edit_btmesh;
BMOperator bmop;
- /* int count; */ /* UNUSED */
+ int count;
EDBM_InitOpf(em, &bmop, op, "finddoubles verts=%hv dist=%f",
BM_ELEM_SELECT, RNA_float_get(op->ptr, "mergedist"));
BMO_op_exec(em->bm, &bmop);
- /* count = BMO_slot_map_count(em->bm, &bmop, "targetmapout"); */ /* UNUSED */
+ count = BMO_slot_map_count(em->bm, &bmop, "targetmapout");
if (!EDBM_CallOpf(em, op, "weldverts targetmap=%s", &bmop, "targetmapout")) {
BMO_op_finish(em->bm, &bmop);
@@ -2211,16 +2211,9 @@ static int removedoublesflag_exec(bContext *C, wmOperator *op)
if (!EDBM_FinishOp(em, &bmop, op, TRUE)) {
return OPERATOR_CANCELLED;
}
+
+ BKE_reportf(op->reports, RPT_INFO, "Removed %d vert%s", count, (count==1)?"ex":"ices");
- /* we need a better way of reporting this, since this doesn't work
- * with the last operator panel correctly.
-
- if (count)
- {
- sprintf(msg, "Removed %d vertices", count);
- BKE_report(op->reports, RPT_INFO, msg);
- }
- */
DAG_id_tag_update(obedit->data, OB_RECALC_DATA);
WM_event_add_notifier(C, NC_GEOM|ND_DATA, obedit->data);