diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-17 06:20:23 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-17 06:20:23 +0400 |
| commit | bbe69705a52386ca5b6552d7187b0492b4b2b378 (patch) | |
| tree | 48fb3e4b70c78b2a31f1c6a0a02e33b09b0113f5 /source/blender/editors/metaball | |
| parent | 0e0d88605f0ce7422f278c399b913d394bc7f3ca (diff) | |
| parent | 67b2985cceaf789e1b77d4f70864bf67ee9375c3 (diff) | |
svn merge ^/trunk/blender -r43420:43436
Diffstat (limited to 'source/blender/editors/metaball')
| -rw-r--r-- | source/blender/editors/metaball/mball_ops.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/editors/metaball/mball_ops.c b/source/blender/editors/metaball/mball_ops.c index 4c69bb3e559..c7635bcf2cc 100644 --- a/source/blender/editors/metaball/mball_ops.c +++ b/source/blender/editors/metaball/mball_ops.c @@ -37,6 +37,8 @@ #include "ED_mball.h" #include "ED_screen.h" +#include "BLI_utildefines.h" + #include "mball_intern.h" void ED_operatortypes_metaball(void) @@ -62,8 +64,10 @@ void ED_keymap_metaball(wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "OBJECT_OT_metaball_add", AKEY, KM_PRESS, KM_SHIFT, 0); WM_keymap_add_item(keymap, "MBALL_OT_reveal_metaelems", HKEY, KM_PRESS, KM_ALT, 0); - WM_keymap_add_item(keymap, "MBALL_OT_hide_metaelems", HKEY, KM_PRESS, 0, 0); - RNA_boolean_set(WM_keymap_add_item(keymap, "MBALL_OT_hide_metaelems", HKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "unselected", 1); + kmi = WM_keymap_add_item(keymap, "MBALL_OT_hide_metaelems", HKEY, KM_PRESS, 0, 0); + RNA_boolean_set(kmi->ptr, "unselected", FALSE); + kmi = WM_keymap_add_item(keymap, "MBALL_OT_hide_metaelems", HKEY, KM_PRESS, KM_SHIFT, 0); + RNA_boolean_set(kmi->ptr, "unselected", TRUE); WM_keymap_add_item(keymap, "MBALL_OT_delete_metaelems", XKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "MBALL_OT_delete_metaelems", DELKEY, KM_PRESS, 0, 0); |