[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18774] branches/blender2.5/blender/source /blender/editors/mesh: edit mode selection menu - ctrl+shift+tab

[Shaul Kedem]

Revision: 18774
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18774
Author:   shul
Date:     2009-02-01 02:04:00 +0100 (Sun, 01 Feb 2009)

Log Message:
-----------
edit mode selection menu - ctrl+shift+tab

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/mesh/editmesh_mods.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_mods.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/mesh/editmesh_mods.c	2009-02-01 00:18:45 UTC (rev 18773)
+++ branches/blender2.5/blender/source/blender/editors/mesh/editmesh_mods.c	2009-02-01 01:04:00 UTC (rev 18774)
@@ -3654,9 +3654,9 @@
 	EM_selectmode_flush(em);
 }
 
-void EM_selectmode_menu(EditMesh *em)
+void mesh_selection_mode_menu(EditMesh *em, int val)
 {
-	int val, ctrl= 0; // XXX
+	int ctrl= 0; // XXX
 	
 //	if(em->selectmode & SCE_SELECT_VERTEX) pupmenu_set_active(1);
 //	else if(em->selectmode & SCE_SELECT_EDGE) pupmenu_set_active(2);
@@ -3686,6 +3686,58 @@
 	}
 }
 
+static int mesh_selection_mode_menu_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+	int items;
+	char *menu, *p;
+	
+	items = 3;
+	
+	menu= MEM_callocN(items * OP_MAX_TYPENAME, "string");
+	
+	p= menu + sprintf(menu, "%s %%t", "Selection Mode");
+	p+= sprintf(p, "|%s %%x%d", "Vertices", 1);
+	p+= sprintf(p, "|%s %%x%d", "Edges", 2);
+	p+= sprintf(p, "|%s %%x%d", "Faces", 3);
+	
+	uiPupMenuOperator(C, 20, op, "index", menu);
+	MEM_freeN(menu);
+	
+	return OPERATOR_RUNNING_MODAL;
+}
+
+static int mesh_selection_mode_menu_exec(bContext *C, wmOperator *op)
+{		
+	
+	Object *obedit= CTX_data_edit_object(C);
+	EditMesh *em= ((Mesh *)obedit->data)->edit_mesh;
+
+	mesh_selection_mode_menu(em, RNA_int_get(op->ptr,"index"));
+
+	WM_event_add_notifier(C, NC_WINDOW, obedit);
+
+	return OPERATOR_FINISHED;
+}
+
+void MESH_OT_mesh_selection_mode_menu(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Selection Mode";
+	ot->idname= "MESH_OT_mesh_selection_mode_menu";
+	
+	/* api callbacks */
+	ot->invoke= mesh_selection_mode_menu_invoke;
+	ot->exec= mesh_selection_mode_menu_exec;
+	
+	ot->poll= ED_operator_editmesh;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	
+	/*props */
+	RNA_def_int(ot->srna, "index", 1, 0, INT_MAX, "Index", "", 0, 4);
+	
+}
 /* ************************* SEAMS AND EDGES **************** */
 
 void editmesh_mark_seam(EditMesh *em, int clear)

Modified: branches/blender2.5/blender/source/blender/editors/mesh/mesh_intern.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/mesh/mesh_intern.h	2009-02-01 00:18:45 UTC (rev 18773)
+++ branches/blender2.5/blender/source/blender/editors/mesh/mesh_intern.h	2009-02-01 01:04:00 UTC (rev 18774)
@@ -191,6 +191,7 @@
 void MESH_OT_similar_face_select(struct wmOperatorType *ot);
 void MESH_OT_selectrandom_mesh(struct wmOperatorType *ot);
 void MESH_OT_vertices_to_sphere(struct wmOperatorType *ot);
+void MESH_OT_mesh_selection_mode_menu(struct wmOperatorType *ot);
 
 extern EditEdge *findnearestedge(ViewContext *vc, int *dist);
 extern void EM_automerge(int update);

Modified: branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c	2009-02-01 00:18:45 UTC (rev 18773)
+++ branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c	2009-02-01 01:04:00 UTC (rev 18774)
@@ -114,6 +114,7 @@
 	WM_operatortype_append(MESH_OT_selectconnected_mesh_all);
 	WM_operatortype_append(MESH_OT_selectconnected_mesh);
 	WM_operatortype_append(MESH_OT_selectrandom_mesh);
+	WM_operatortype_append(MESH_OT_mesh_selection_mode_menu);
 	WM_operatortype_append(MESH_OT_hide_mesh);
 	WM_operatortype_append(MESH_OT_reveal_mesh);
 	WM_operatortype_append(MESH_OT_consistant_normals);
@@ -194,7 +195,11 @@
 	WM_keymap_add_item(keymap, "MESH_OT_similar_edge_select", GKEY, KM_PRESS, KM_SHIFT2|KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "MESH_OT_similar_face_select", GKEY, KM_PRESS, KM_SHIFT|KM_CTRL2, 0);
 	
+	/* selection mode */
 	
+	WM_keymap_add_item(keymap, "MESH_OT_mesh_selection_mode_menu", TABKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0);
+	
+	
 	/* transform keymap already defined, so no tweaks for select */
 	
 	/* hide */