[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39073] trunk/blender: move the ndof menu into the userpref's since it adjusts preferences, also renamed VIEW3D_MT_ndof_settings -> USERPREF_MT_ndof_settings since it has no view3d specific settings.
Campbell Barton
ideasman42 at gmail.com
Fri Aug 5 16:53:13 CEST 2011
Revision: 39073
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39073
Author: campbellbarton
Date: 2011-08-05 14:53:13 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
move the ndof menu into the userpref's since it adjusts preferences, also renamed VIEW3D_MT_ndof_settings -> USERPREF_MT_ndof_settings since it has no view3d specific settings.
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_ui/space_userpref.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/release/scripts/startup/bl_ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_userpref.py 2011-08-05 12:17:49 UTC (rev 39072)
+++ trunk/blender/release/scripts/startup/bl_ui/space_userpref.py 2011-08-05 14:53:13 UTC (rev 39073)
@@ -755,6 +755,31 @@
from bl_ui.space_userpref_keymap import InputKeyMapPanel
+class USERPREF_MT_ndof_settings(bpy.types.Menu):
+ # accessed from the window keybindings in C (only)
+ bl_label = "3D Mouse Settings"
+
+ def draw(self, context):
+ layout = self.layout
+ input_prefs = context.user_preferences.inputs
+
+ layout.separator()
+ layout.prop(input_prefs, "ndof_sensitivity")
+
+ if context.space_data.type == 'VIEW_3D':
+ layout.separator()
+ layout.prop(input_prefs, "ndof_show_guide")
+
+ layout.separator()
+ layout.label(text="orbit options")
+ layout.prop(input_prefs, "ndof_orbit_invert_axes")
+
+ layout.separator()
+ layout.label(text="fly options")
+ layout.prop(input_prefs, "ndof_fly_helicopter", icon='NDOF_FLY')
+ layout.prop(input_prefs, "ndof_lock_horizon", icon='NDOF_DOM')
+
+
class USERPREF_PT_input(bpy.types.Panel, InputKeyMapPanel):
bl_space_type = 'USER_PREFERENCES'
bl_label = "Input"
Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2011-08-05 12:17:49 UTC (rev 39072)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2011-08-05 14:53:13 UTC (rev 39073)
@@ -349,30 +349,6 @@
layout.operator("view3d.fly")
-class VIEW3D_MT_ndof_settings(bpy.types.Menu):
- bl_label = "3D Mouse Settings"
-
- def draw(self, context):
- layout = self.layout
- input_prefs = context.user_preferences.inputs
-
- layout.separator()
- layout.prop(input_prefs, "ndof_sensitivity")
-
- if context.space_data.type == 'VIEW_3D':
- layout.separator()
- layout.prop(input_prefs, "ndof_show_guide")
-
- layout.separator()
- layout.label(text="orbit options")
- layout.prop(input_prefs, "ndof_orbit_invert_axes")
-
- layout.separator()
- layout.label(text="fly options")
- layout.prop(input_prefs, "ndof_fly_helicopter", icon='NDOF_FLY')
- layout.prop(input_prefs, "ndof_lock_horizon", icon='NDOF_DOM')
-
-
class VIEW3D_MT_view_align(bpy.types.Menu):
bl_label = "Align View"
Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c 2011-08-05 12:17:49 UTC (rev 39072)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c 2011-08-05 14:53:13 UTC (rev 39073)
@@ -3719,7 +3719,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_menu(keymap, "VIEW3D_MT_ndof_settings", NDOF_BUTTON_MENU, KM_PRESS, 0, 0);
+ WM_keymap_add_menu(keymap, "USERPREF_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 */
More information about the Bf-blender-cvs
mailing list