Cleanup: remove unused toolbox delay preferences
authorCampbell Barton <ideasman42@gmail.com>
Wed, 6 Feb 2019 07:18:54 +0000 (18:18 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 6 Feb 2019 07:18:54 +0000 (18:18 +1100)
source/blender/blenloader/intern/versioning_userdef.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_userdef.c

index 6fa86a06e06743e2759c3679e915eb36017a6b7d..c02f5638452fb32205619e1dbb836bdba36a0bb8 100644 (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 */
index 80f9fff3e21bdfef84eda9794a34edddf3ed9c3f..23bd962760b33de9849ff251e8d7f8c0f36da746 100644 (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];
index 578779e18f56575f0af682abedf52d068a5ec1a3..35e7c28647164b0fd68dd8fb7164de4ff7558cb0 100644 (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");