[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38914] trunk/blender/source/blender/ windowmanager/intern/wm_operators.c: replace WM_OT_ndof_menu with a key-> menu assignment.

[Campbell Barton]

Revision: 38914
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38914
Author:   campbellbarton
Date:     2011-08-02 06:40:40 +0000 (Tue, 02 Aug 2011)
Log Message:
-----------
replace WM_OT_ndof_menu with a key->menu assignment.

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/intern/wm_operators.c

Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2011-08-02 06:32:53 UTC (rev 38913)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2011-08-02 06:40:40 UTC (rev 38914)
@@ -1411,22 +1411,6 @@
 	ot->poll= wm_search_menu_poll;
 }
 
-static int wm_ndof_menu_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *UNUSED(event))
-{
-	uiPupMenuInvoke(C,"VIEW3D_MT_ndof_settings");
-
-	return OPERATOR_FINISHED; // <-- correct?
-	return OPERATOR_CANCELLED; // <-- correct?
-}
-
-static void WM_OT_ndof_menu(wmOperatorType *ot)
-{
-	ot->name = "NDOF Menu";
-	ot->idname = "WM_OT_ndof_menu";
-	
-	ot->invoke = wm_ndof_menu_invoke;
-}
-
 static int wm_call_menu_exec(bContext *C, wmOperator *op)
 {
 	char idname[BKE_ST_MAXNAME];
@@ -3517,7 +3501,6 @@
 	WM_operatortype_append(WM_OT_debug_menu);
 	WM_operatortype_append(WM_OT_splash);
 	WM_operatortype_append(WM_OT_search_menu);
-	WM_operatortype_append(WM_OT_ndof_menu);
 	WM_operatortype_append(WM_OT_call_menu);
 	WM_operatortype_append(WM_OT_radial_control);
 	WM_operatortype_append(WM_OT_ndof_sensitivity_change);
@@ -3743,7 +3726,7 @@
 
 	/* menus that can be accessed anywhere in blender */
 	WM_keymap_verify_item(keymap, "WM_OT_search_menu", SPACEKEY, KM_PRESS, 0, 0);
-	WM_keymap_add_item(keymap, "WM_OT_ndof_menu", NDOF_BUTTON_MENU, KM_PRESS, 0, 0);
+	WM_keymap_add_menu(keymap, "VIEW3D_MT_ndof_settings", NDOF_BUTTON_MENU, KM_PRESS, 0, 0);
 
 	/* Space switching */
 	kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", F2KEY, KM_PRESS, KM_SHIFT, 0); /* new in 2.5x, was DXF export */