diff options
| author | julianeisel <julian_eisel@web.de> | 2015-01-26 03:57:58 +0300 |
|---|---|---|
| committer | julianeisel <julian_eisel@web.de> | 2015-01-26 03:57:58 +0300 |
| commit | c792e546991bd96e92f15b34e5e7111838c723ff (patch) | |
| tree | db63efd98665c7c3ee7c04398cc47ca121a079e1 /source/blender/editors/interface | |
| parent | ce6ba965dc4956910e51e40aff7707b6ac85e23d (diff) | |
If a modifier key is held, don't open context menu
D1019 by @gregzaal (minor edits by me).
Thanks for the patch!
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index d9023b94e19..a24ff9960e2 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -6392,7 +6392,10 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, const wmEvent * return WM_UI_HANDLER_BREAK; } /* handle menu */ - else if (event->type == RIGHTMOUSE && event->val == KM_PRESS) { + else if (event->type == RIGHTMOUSE && + event->val == KM_PRESS && + ((event->ctrl + event->alt + event->shift) == 0)) + { /* RMB has two options now */ if (ui_but_menu(C, but)) { return WM_UI_HANDLER_BREAK; |