sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Bugfix #22872: invert zoom direction doesn't work

Browse Source 
The setting for this (IMO it should really be on by default, for reasons I've outlined recently) was not exposed at all. 

The setting that was shown was a new(?) option in 2.5 which dealt with Ctrl-MMB drag zoom.
This commit is contained in:
Joshua Leung 2010-07-20 12:37:42 +00:00
parent f9e9e90a02
commit beb98c9e0c
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
release/scripts/ui/space_userpref.py
View File

@ -352,7 +352,7 @@ class USERPREF_PT_edit(bpy.types.Panel):
col.prop(edit, "duplicate_lamp", text="Lamp")
col.prop(edit, "duplicate_material", text="Material")
col.prop(edit, "duplicate_texture", text="Texture")
col.prop(edit, "duplicate_fcurve", text="F-Curve")
#col.prop(edit, "duplicate_fcurve", text="F-Curve")
col.prop(edit, "duplicate_action", text="Action")
col.prop(edit, "duplicate_particle", text="Particle")
@ -778,8 +778,9 @@ class USERPREF_PT_input(InputKeyMapPanel):
#col.separator()
#sub = col.column()
#sub.label(text="Mouse Wheel:")
sub = col.column()
sub.label(text="Mouse Wheel:")
sub.prop(inputs, "wheel_invert_zoom", text="Invert Wheel Zoom Direction")
#sub.prop(view, "wheel_scroll_lines", text="Scroll Lines")
col.separator()

28
source/blender/makesrna/intern/rna_userdef.c
View File

@ -1989,20 +1989,6 @@ static void rna_def_userdef_view(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Mini Axis Brightness", "The brightness of the icon");
RNA_def_property_update(prop, 0, "rna_userdef_update");
/* middle mouse button */
prop= RNA_def_property(srna, "use_middle_mouse_paste", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_MMB_PASTE);
RNA_def_property_ui_text(prop, "Middle Mouse Paste", "In text window, paste with middle mouse button instead of panning");
prop= RNA_def_property(srna, "wheel_invert_zoom", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_WHEELZOOMDIR);
RNA_def_property_ui_text(prop, "Wheel Invert Zoom", "Swap the Mouse Wheel zoom direction");
prop= RNA_def_property(srna, "wheel_scroll_lines", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "wheellinescroll");
RNA_def_property_range(prop, 0, 32);
RNA_def_property_ui_text(prop, "Wheel Scroll Lines", "The number of lines scrolled at a time with the mouse wheel");
prop= RNA_def_property(srna, "smooth_view", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "smooth_viewtx");
RNA_def_property_range(prop, 0, 1000);
@ -2672,6 +2658,20 @@ static void rna_def_userdef_input(BlenderRNA *brna)
RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_NONUMPAD);
RNA_def_property_ui_text(prop, "Emulate Numpad", "Causes the 1 to 0 keys to act as the numpad (useful for laptops)");
/* middle mouse button */
prop= RNA_def_property(srna, "use_middle_mouse_paste", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_MMB_PASTE);
RNA_def_property_ui_text(prop, "Middle Mouse Paste", "In text window, paste with middle mouse button instead of panning");
prop= RNA_def_property(srna, "wheel_invert_zoom", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_WHEELZOOMDIR);
RNA_def_property_ui_text(prop, "Wheel Invert Zoom", "Swap the Mouse Wheel zoom direction");
prop= RNA_def_property(srna, "wheel_scroll_lines", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "wheellinescroll");
RNA_def_property_range(prop, 0, 32);
RNA_def_property_ui_text(prop, "Wheel Scroll Lines", "The number of lines scrolled at a time with the mouse wheel");
/* U.keymaps - custom keymaps that have been edited from default configs */
prop= RNA_def_property(srna, "edited_keymaps", PROP_COLLECTION, PROP_NONE);
RNA_def_property_collection_sdna(prop, NULL, "keymaps", NULL);