griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: remove unused toolbox delay preferences

Browse Source
This commit is contained in:
Campbell Barton
2019-02-06 18:18:54 +11:00
parent ed53c8ea76
commit 2d5e2de88b
3 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -149,10 +149,6 @@ void BLO_version_defaults_userpref_blend(Main *bmain, UserDef *userdef)
userdef->menuthreshold1 = 5;
userdef->menuthreshold2 = 2;
}
if (userdef->tb_leftmouse == 0) {
userdef->tb_leftmouse = 5;
userdef->tb_rightmouse = 5;
}
if (userdef->mixbufsize == 0) userdef->mixbufsize = 2048;
if (userdef->autokey_mode == 0) {
/* 'add/replace' but not on */

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

@@ -639,7 +639,7 @@ typedef struct UserDef {
short gp_manhattendist, gp_euclideandist, gp_eraser;
/** #eGP_UserdefSettings. */
short gp_settings;
short tb_leftmouse, tb_rightmouse;
char _pad13[4];
struct SolidLight light_param[4];
float light_ambient[3];
char _pad3[4];

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

@@ -3829,19 +3829,6 @@ static void rna_def_userdef_view(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Prompt Quit",
"Ask for confirmation when quitting with unsaved changes");
/* Toolbox click-hold delay */
prop = RNA_def_property(srna, "open_left_mouse_delay", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "tb_leftmouse");
RNA_def_property_range(prop, 1, 40);
RNA_def_property_ui_text(prop, "Hold LMB Open Toolbox Delay",
"Time in 1/10 seconds to hold the Left Mouse Button before opening the toolbox");
prop = RNA_def_property(srna, "open_right_mouse_delay", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "tb_rightmouse");
RNA_def_property_range(prop, 1, 40);
RNA_def_property_ui_text(prop, "Hold RMB Open Toolbox Delay",
"Time in 1/10 seconds to hold the Right Mouse Button before opening the toolbox");
prop = RNA_def_property(srna, "show_column_layout", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_PLAINMENUS);
RNA_def_property_ui_text(prop, "Toolbox Column Layout", "Use a column layout for toolbox");