[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18630] branches/blender2.5/blender/source /blender/editors/mesh: remove doubles op, ton: is this working properly?

[Shaul Kedem]

Revision: 18630
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18630
Author:   shul
Date:     2009-01-23 04:07:07 +0100 (Fri, 23 Jan 2009)

Log Message:
-----------
remove doubles op, ton: is this working properly?

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c
    branches/blender2.5/blender/source/blender/editors/mesh/mesh_intern.h
    branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c

Modified: branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c	2009-01-23 02:59:21 UTC (rev 18629)
+++ branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c	2009-01-23 03:07:07 UTC (rev 18630)
@@ -487,6 +487,32 @@
 	return a;	/* amount */
 }
 
+static int removedoublesflag_exec(bContext *C, wmOperator *op)
+{
+	Object *obedit= CTX_data_edit_object(C);
+	Scene *scene = CTX_data_scene(C);
+	EditMesh *em= ((Mesh *)obedit->data)->edit_mesh;
+
+	removedoublesflag(em,1,0,scene->toolsettings->doublimit);
+		
+	ED_undo_push(C, "Remove Doubles");	// Note this will become depricated 
+	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+	
+	return OPERATOR_FINISHED;	
+}
+
+void MESH_OT_removedoublesflag(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Remove Doubles";
+	ot->idname= "MESH_OT_removedoublesflag";
+	
+	/* api callbacks */
+	ot->exec= removedoublesflag_exec;
+	ot->poll= ED_operator_editmesh;
+}
+
+// XXX is this needed?
 /* called from buttons */
 static void xsortvert_flag__doSetX(void *userData, EditVert *eve, int x, int y, int index)
 {

Modified: branches/blender2.5/blender/source/blender/editors/mesh/mesh_intern.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/mesh/mesh_intern.h	2009-01-23 02:59:21 UTC (rev 18629)
+++ branches/blender2.5/blender/source/blender/editors/mesh/mesh_intern.h	2009-01-23 03:07:07 UTC (rev 18630)
@@ -215,6 +215,7 @@
 void MESH_OT_subdivide_multi(struct wmOperatorType *ot);
 void MESH_OT_subdivide_multi_fractal(struct wmOperatorType *ot);
 void MESH_OT_subdivide_smooth(struct wmOperatorType *ot);
+void MESH_OT_removedoublesflag(struct wmOperatorType *ot);
 
 #endif // MESH_INTERN_H
 

Modified: branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c	2009-01-23 02:59:21 UTC (rev 18629)
+++ branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c	2009-01-23 03:07:07 UTC (rev 18630)
@@ -131,6 +131,7 @@
 	WM_operatortype_append(MESH_OT_add_primitive_uv_sphere);
 	WM_operatortype_append(MESH_OT_add_primitive_ico_sphere);
 	WM_operatortype_append(MESH_OT_add_duplicate);
+	WM_operatortype_append(MESH_OT_removedoublesflag);
 
 }
 
@@ -166,6 +167,7 @@
 	/*WM_keymap_add_item(keymap, "MESH_OT_subdivide_multi", WKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0);
 	WM_keymap_add_item(keymap, "MESH_OT_subdivide_multi_fractal", WKEY, KM_PRESS, KM_ALT, 0);
 	WM_keymap_add_item(keymap, "MESH_OT_subdivide_smooth", WKEY, KM_PRESS, KM_CTRL|KM_ALT, 0);*/
+	WM_keymap_add_item(keymap, "MESH_OT_removedoublesflag", VKEY, KM_PRESS, KM_CTRL, 0);