[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40001] branches/bmesh/blender/source/ blender/editors/mesh: Patch 28537 from Andrew Wiggin, fixes second issue in 28492 (edge ring deselect not working

[Howard Trickey]

Revision: 40001
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40001
Author:   howardt
Date:     2011-09-07 08:34:15 +0000 (Wed, 07 Sep 2011)
Log Message:
-----------
Patch 28537 from Andrew Wiggin, fixes second issue in 28492 (edge ring deselect not working

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
    branches/bmesh/blender/source/blender/editors/mesh/loopcut.c

Modified: branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c	2011-09-07 08:09:56 UTC (rev 40000)
+++ branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c	2011-09-07 08:34:15 UTC (rev 40001)
@@ -1040,6 +1040,7 @@
 	/* identifiers */
 	ot->name= "Loop Select";
 	ot->idname= "MESH_OT_loop_select";
+	ot->description= "Select a loop";
 	
 	/* api callbacks */
 	ot->invoke= mesh_select_loop_invoke;
@@ -1050,10 +1051,28 @@
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 	
 	/* properties */
-	RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", "");
-	RNA_def_boolean(ot->srna, "ring", 0, "Select Ring", "");
+	RNA_def_boolean(ot->srna, "extend", 0, "Extend Select", "Extend the selection");
+	RNA_def_boolean(ot->srna, "ring", 0, "Select Ring", "Select ring");
 }
 
+void MESH_OT_edgering_select (wmOperatorType *ot)
+{
+	/* description */
+	ot->name= "Edge Ring Select";
+	ot->idname= "MESH_OT_edgering_select";
+	ot->description= "Select an edge ring";
+	
+	/* callbacks */
+	ot->invoke= mesh_select_loop_invoke;
+	ot->poll= ED_operator_editmesh; 
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+
+	RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend the selection");
+	RNA_def_boolean(ot->srna, "ring", 1, "Select Ring", "Select ring");
+}
+
 /* ******************* edgetag_shortest_path and helpers ****************** */
 
 static float edgetag_cut_cost(BMEditMesh *UNUSED(em), BMEdge *e1, BMEdge *e2, BMVert* v)

Modified: branches/bmesh/blender/source/blender/editors/mesh/loopcut.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/loopcut.c	2011-09-07 08:09:56 UTC (rev 40000)
+++ branches/bmesh/blender/source/blender/editors/mesh/loopcut.c	2011-09-07 08:34:15 UTC (rev 40001)
@@ -384,39 +384,6 @@
 	return OPERATOR_CANCELLED;
 }
 
-static int ringsel_invoke (bContext *C, wmOperator *op, wmEvent *evt)
-{
-	tringselOpData *lcd;
-	BMEdge *edge;
-	int dist = 75;
-	
-	view3d_operator_needs_opengl(C);
-
-	if (!ringsel_init(C, op, 0))
-		return OPERATOR_CANCELLED;
-	
-	lcd = op->customdata;
-	
-	if (lcd->em->selectmode == SCE_SELECT_FACE) {
-		ringsel_exit(C, op);
-		WM_operator_name_call(C, "MESH_OT_loop_select", WM_OP_INVOKE_REGION_WIN, NULL);
-		return OPERATOR_CANCELLED;
-	}
-
-	lcd->vc.mval[0] = evt->mval[0];
-	lcd->vc.mval[1] = evt->mval[1];
-	
-	edge = EDBM_findnearestedge(&lcd->vc, &dist);
-
-	lcd->eed = edge;
-	
-	ringsel_find_edge(lcd, 1);
-	ringsel_finish(C, op);
-	ringsel_exit(C, op);
-
-	return OPERATOR_FINISHED;
-}
-
 static int ringcut_invoke (bContext *C, wmOperator *op, wmEvent *evt)
 {
 	Object *obedit= CTX_data_edit_object(C);
@@ -534,23 +501,6 @@
 	return OPERATOR_RUNNING_MODAL;
 }
 
-void MESH_OT_edgering_select (wmOperatorType *ot)
-{
-	/* description */
-	ot->name= "Edge Ring Select";
-	ot->idname= "MESH_OT_edgering_select";
-	ot->description= "Select an edge ring";
-	
-	/* callbacks */
-	ot->invoke= ringsel_invoke;
-	ot->poll= ED_operator_editmesh_region_view3d; 
-	
-	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
-
-	RNA_def_boolean(ot->srna, "extend", 0, "Extend", "Extend the selection");
-}
-
 void MESH_OT_loopcut (wmOperatorType *ot)
 {
 	/* description */