[Bf-blender-cvs] [b636599] master: Correction to c792e546991bd9: OS-Key should be checked as well

[julianeisel]

Commit: b636599fde2a0f86377d8b338c59d635340c5ba5
Author: julianeisel
Date:   Mon Jan 26 02:51:09 2015 +0100
Branches: master
https://developer.blender.org/rBb636599fde2a0f86377d8b338c59d635340c5ba5

Correction to c792e546991bd9: OS-Key should be checked as well

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

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 7d1d9d7..fcd1ebf 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -6393,7 +6393,7 @@ static int ui_do_button(bContext *C, uiBlock *block, 
uiBut *but, const wmEvent *
                }
                /* handle menu */
                else if ((event->type == RIGHTMOUSE) &&
-                        ((event->ctrl + event->alt + event->shift) == 0) &&
+                        ((event->ctrl + event->oskey + event->alt + 
event->shift) == 0) &&
                         (event->val == KM_PRESS))
                {
                        /* RMB has two options now */

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs