diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-01-03 16:13:54 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-03 16:13:54 +0300 |
| commit | 72e8a0c5525da6d85db6547f96555d2308885677 (patch) | |
| tree | fec611d2e07abd805900990f7d5cd8da869c8553 /source | |
| parent | 8a2a7687f4a7eecd49996251303b5eaed23d995d (diff) | |
check modifier keys are not pressed when using keys as accelerators, it meant you couldn't copy the operator from a menu with Ctrl+C because C would be used to activate an item.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 2537b89d791..c548be947fa 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -5673,7 +5673,11 @@ int ui_handle_menu_event(bContext *C, wmEvent *event, uiPopupBlockHandle *menu, case YKEY: case ZKEY: { - if(event->val == KM_PRESS) { + if( (event->val == KM_PRESS) && + (event->shift == FALSE) && + (event->ctrl == FALSE) && + (event->oskey == FALSE) + ) { count= 0; for(but= block->buttons.first; but; but= but->next) { |