[Bf-blender-cvs] [c792e54] master: If a modifier key is held, don't open context menu

[julianeisel]

Commit: c792e546991bd96e92f15b34e5e7111838c723ff
Author: julianeisel
Date:   Mon Jan 26 01:57:58 2015 +0100
Branches: master
https://developer.blender.org/rBc792e546991bd96e92f15b34e5e7111838c723ff

If a modifier key is held, don't open context menu

D1019 by @gregzaal (minor edits by me).

Thanks for the patch!

===================================================================

M	source/blender/editors/interface/interface_handlers.c

===================================================================

diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index d9023b9..a24ff99 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;