[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34037] trunk/blender/source/blender/ editors/interface/interface_handlers.c: 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 .

[Campbell Barton]

Revision: 34037
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34037
Author:   campbellbarton
Date:     2011-01-03 14:13:54 +0100 (Mon, 03 Jan 2011)

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_handlers.c

Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c	2011-01-03 12:48:16 UTC (rev 34036)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2011-01-03 13:13:54 UTC (rev 34037)
@@ -5673,7 +5673,11 @@
 				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) {