From 2d5e2de88b9cc9837ad4c7e8c16809303ed16aa1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 6 Feb 2019 18:18:54 +1100 Subject: Cleanup: remove unused toolbox delay preferences --- source/blender/blenloader/intern/versioning_userdef.c | 4 ---- source/blender/makesdna/DNA_userdef_types.h | 2 +- source/blender/makesrna/intern/rna_userdef.c | 13 ------------- 3 files changed, 1 insertion(+), 18 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c index 6fa86a06e06..c02f5638452 100644 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@ -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 */ diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 80f9fff3e21..23bd962760b 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -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]; diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 578779e18f5..35e7c286471 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -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"); -- cgit v1.2.3