diff options
author | Matt Ebb <matt@mke3.net> | 2010-04-01 06:28:08 +0400 |
---|---|---|
committer | Matt Ebb <matt@mke3.net> | 2010-04-01 06:28:08 +0400 |
commit | f49a82b03ebf63f8416b238cf32f29382bc331c9 (patch) | |
tree | 0a5d11343e8cbc7f1105b6883dde949841f3b491 /source/blender/makesrna/intern/rna_userdef.c | |
parent | 8f5438dcd4faf07583c359b456a9b2db85a0c4d9 (diff) |
Fix [#20711] Loop selection not working with Emulate MMB + Left mouse select
Emulate 3 button mouse is now disabled when Left mouse select is used, to
prevent keymap conflicts. Configs for single button macs etc we can do with
keymap presets.
Diffstat (limited to 'source/blender/makesrna/intern/rna_userdef.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 116fc8b68ea..881df6eb494 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -68,8 +68,7 @@ static void rna_userdef_mipmap_update(Main *bmain, Scene *scene, PointerRNA *ptr rna_userdef_update(bmain, scene, ptr); } -#if 0 -static void rna_userdef_lmb_select_set(PointerRNA *ptr,int value) +static void rna_userdef_select_mouse_set(PointerRNA *ptr,int value) { UserDef *userdef = (UserDef*)ptr->data; @@ -81,22 +80,6 @@ static void rna_userdef_lmb_select_set(PointerRNA *ptr,int value) userdef->flag &= ~USER_LMOUSESELECT; } -static void rna_userdef_rmb_select_set(PointerRNA *ptr,int value) -{ - rna_userdef_lmb_select_set(ptr, !value); -} -#endif - -static void rna_userdef_emulate_set(PointerRNA *ptr,int value) -{ - UserDef *userdef = (UserDef*)ptr->data; - - if(userdef->flag & USER_LMOUSESELECT) - userdef->flag &= ~USER_TWOBUTTONMOUSE; - else - userdef->flag ^= USER_TWOBUTTONMOUSE; -} - static int rna_userdef_autokeymode_get(PointerRNA *ptr) { UserDef *userdef = (UserDef*)ptr->data; @@ -2592,12 +2575,13 @@ static void rna_def_userdef_input(BlenderRNA *brna) prop= RNA_def_property(srna, "select_mouse", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag"); RNA_def_property_enum_items(prop, select_mouse_items); + RNA_def_property_enum_funcs(prop, NULL, "rna_userdef_select_mouse_set", NULL); RNA_def_property_ui_text(prop, "Select Mouse", "The mouse button used for selection"); - prop= RNA_def_property(srna, "viewport_zoom_style", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "zoom_style", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "viewzoom"); RNA_def_property_enum_items(prop, view_zoom_styles); - RNA_def_property_ui_text(prop, "Viewport Zoom Style", "Which style to use for viewport scaling"); + RNA_def_property_ui_text(prop, "Zoom Style", "Which style to use for viewport scaling"); prop= RNA_def_property(srna, "zoom_axis", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "uiflag"); @@ -2634,7 +2618,6 @@ static void rna_def_userdef_input(BlenderRNA *brna) prop= RNA_def_property(srna, "emulate_3_button_mouse", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_TWOBUTTONMOUSE); - RNA_def_property_boolean_funcs(prop, NULL, "rna_userdef_emulate_set"); RNA_def_property_ui_text(prop, "Emulate 3 Button Mouse", "Emulates Middle Mouse with Alt+LeftMouse (doesnt work with Left Mouse Select option)"); prop= RNA_def_property(srna, "emulate_numpad", PROP_BOOLEAN, PROP_NONE); |