[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44262] trunk/blender/source/blender/ editors/mesh/bmesh_tools.c: B-Mesh:

Thomas Dinges blender at dingto.org
Sun Feb 19 21:29:05 CET 2012


Revision: 44262
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44262
Author:   dingto
Date:     2012-02-19 20:29:04 +0000 (Sun, 19 Feb 2012)
Log Message:
-----------
B-Mesh:
* Remove Doubles was missing the info how many vertices were removed, added that back. 

Modified Paths:
--------------
    trunk/blender/source/blender/editors/mesh/bmesh_tools.c

Modified: trunk/blender/source/blender/editors/mesh/bmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/bmesh_tools.c	2012-02-19 20:27:30 UTC (rev 44261)
+++ trunk/blender/source/blender/editors/mesh/bmesh_tools.c	2012-02-19 20:29:04 UTC (rev 44262)
@@ -2195,13 +2195,13 @@
 	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,17 +2211,10 @@
 	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);
 




More information about the Bf-blender-cvs mailing list