blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 760 Projects 19 Wiki Activity

UI: Remove Unused 'U.wheellinescroll' Property 

Remove 'U.wheellinescroll' preference, currently hidden and unused.

Differential Revision: https://developer.blender.org/D9616

Reviewed by Brecht Van Lommel
This commit is contained in:
Yevgeny Makarov 2020-12-13 12:28:01 -08:00 committed by Harley Acheson
parent 9c0df8e275
commit bec583951d
6 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
release/datafiles/userdef/userdef_default.c
View File

@ -55,7 +55,6 @@ const UserDef U_default = {
.timecode_style = USER_TIMECODE_MINIMAL,
.versions = 1,
.dbl_click_time = 350,
.wheellinescroll = 3,
.mini_axis_type = USER_MINI_AXIS_TYPE_GIZMO,
.uiflag = (USER_FILTERFILEEXTS | USER_DRAWVIEWINFO | USER_PLAINMENUS |
USER_LOCK_CURSOR_ADJUST | USER_DEPTH_CURSOR | USER_AUTOPERSP | USER_GLOBALUNDO |

2
release/scripts/startup/bl_ui/space_userpref.py
View File

@ -1543,8 +1543,6 @@ class USERPREF_PT_navigation_zoom(NavigationPanel, CenterAlignMixIn, Panel):
col.prop(inputs, "use_zoom_to_mouse")
col.prop(inputs, "invert_zoom_wheel", text="Invert Wheel Zoom Direction")
# sub.prop(view, "wheel_scroll_lines", text="Scroll Lines")
class USERPREF_PT_navigation_fly_walk(NavigationPanel, CenterAlignMixIn, Panel):
bl_label = "Fly & Walk"

3
source/blender/blenloader/intern/versioning_userdef.c
View File

@ -328,9 +328,6 @@ void blo_do_versions_userdef(UserDef *userdef)
#define USER_VERSION_ATLEAST(ver, subver) MAIN_VERSION_ATLEAST(userdef, ver, subver)
/* the UserDef struct is not corrected with do_versions() .... ugh! */
if (userdef->wheellinescroll == 0) {
userdef->wheellinescroll = 3;
}
if (userdef->menuthreshold1 == 0) {
userdef->menuthreshold1 = 5;
userdef->menuthreshold2 = 2;

2
source/blender/editors/space_text/text_ops.c
View File

@ -2588,7 +2588,7 @@ static int text_scroll_exec(bContext *C, wmOperator *op)
return OPERATOR_CANCELLED;
}
txt_screen_skip(st, region, lines * U.wheellinescroll);
txt_screen_skip(st, region, lines * 3);
ED_area_tag_redraw(CTX_wm_area(C));

3
source/blender/makesdna/DNA_userdef_types.h
View File

@ -681,8 +681,7 @@ typedef struct UserDef {
short versions;
short dbl_click_time;
char _pad0[2];
char wheellinescroll;
char _pad0[3];
char mini_axis_type;
/** #eUserpref_UI_Flag. */
int uiflag;

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

@ -5946,12 +5946,6 @@ static void rna_def_userdef_input(BlenderRNA *brna)
prop = RNA_def_property(srna, "invert_zoom_wheel", 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", "Number of lines scrolled at a time with the mouse wheel");
}
static void rna_def_userdef_keymap(BlenderRNA *brna)