[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45098] trunk/blender: edge split bmesh operator wasnt accessible (defined but not used), for some reason it had a 'numcuts' option.

[Campbell Barton]

Revision: 45098
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45098
Author:   campbellbarton
Date:     2012-03-23 03:10:44 +0000 (Fri, 23 Mar 2012)
Log Message:
-----------
edge split bmesh operator wasnt accessible (defined but not used), for some reason it had a 'numcuts' option.

add edge split to mesh edge menu.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
    trunk/blender/source/blender/editors/mesh/bmesh_tools.c
    trunk/blender/source/blender/editors/mesh/mesh_ops.c

Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d.py	2012-03-23 01:55:38 UTC (rev 45097)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d.py	2012-03-23 03:10:44 UTC (rev 45098)
@@ -1731,7 +1731,8 @@
 
         layout.separator()
 
-        layout.operator("mesh.bridge_edge_loops", text="Bridge Two Edge Loops")
+        layout.operator("mesh.edge_split")
+        layout.operator("mesh.bridge_edge_loops")
 
         layout.separator()
 

Modified: trunk/blender/source/blender/editors/mesh/bmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/bmesh_tools.c	2012-03-23 01:55:38 UTC (rev 45097)
+++ trunk/blender/source/blender/editors/mesh/bmesh_tools.c	2012-03-23 03:10:44 UTC (rev 45098)
@@ -1218,7 +1218,7 @@
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
 }
 
-static int editbmesh_edge_split(bContext *C, wmOperator *op)
+static int editbmesh_edge_split_exec(bContext *C, wmOperator *op)
 {
 	Object *obedit = CTX_data_edit_object(C);
 	BMEditMesh *em = BMEdit_FromObject(obedit);
@@ -1226,13 +1226,13 @@
 	BMOperator bmop;
 	int len = 0;
 	
-	if (!EDBM_InitOpf(em, &bmop, op, "edgesplit edges=%he numcuts=%i",
-	                  BM_ELEM_SELECT, RNA_int_get(op->ptr, "number_cuts")))
+	if (!EDBM_InitOpf(em, &bmop, op, "edgesplit edges=%he",
+	                  BM_ELEM_SELECT))
 	{
 		return OPERATOR_CANCELLED;
 	}
 	BMO_op_exec(bm, &bmop);
-	len = BMO_slot_get(&bmop, "outsplit")->len;
+	len = BMO_slot_get(&bmop, "edgeout")->len;
 	if (!EDBM_FinishOp(em, &bmop, op, TRUE)) {
 		return OPERATOR_CANCELLED;
 	}
@@ -1245,23 +1245,16 @@
 
 void MESH_OT_edge_split(wmOperatorType *ot)
 {
-	PropertyRNA *prop;
-
 	/* identifiers */
 	ot->name = "Edge Split";
 	ot->idname = "MESH_OT_edge_split";
 	
 	/* api callbacks */
-	ot->exec = editbmesh_edge_split;
+	ot->exec = editbmesh_edge_split_exec;
 	ot->poll = ED_operator_editmesh;
 	
 	/* flags */
 	ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
-
-	prop = RNA_def_int(ot->srna, "number_cuts", 1, 1, 10, "Number of Cuts", "", 1, INT_MAX);
-
-	/* avoid re-using last var because it can cause _very_ high poly meshes and annoy users (or worse crash) */
-	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
 }
 
 /****************** add duplicate operator ***************/
@@ -4567,7 +4560,7 @@
 void MESH_OT_bridge_edge_loops(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name = "Bridge edge loops";
+	ot->name = "Bridge Two Edge Loops";
 	ot->description = "Make faces between two edge loops";
 	ot->idname = "MESH_OT_bridge_edge_loops";
 	

Modified: trunk/blender/source/blender/editors/mesh/mesh_ops.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/mesh_ops.c	2012-03-23 01:55:38 UTC (rev 45097)
+++ trunk/blender/source/blender/editors/mesh/mesh_ops.c	2012-03-23 03:10:44 UTC (rev 45098)
@@ -160,6 +160,7 @@
 
 	WM_operatortype_append(MESH_OT_bridge_edge_loops);
 	WM_operatortype_append(MESH_OT_inset);
+	WM_operatortype_append(MESH_OT_edge_split);
 
 #ifdef WITH_GAMEENGINE
 	WM_operatortype_append(MESH_OT_navmesh_make);