[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27893] trunk/blender/source/blender/ editors/interface/interface_handlers.c: Only add drivers (and keying sets, keyframes etc) when exact key combo is

[Matt Ebb]

Revision: 27893
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27893
Author:   broken
Date:     2010-03-31 09:03:13 +0200 (Wed, 31 Mar 2010)

Log Message:
-----------
Only add drivers (and keying sets, keyframes etc) when exact key combo is 
pressed. This prevent adding drivers to properties when mouse is over a node, 
trying to duplicate it with Shift D.

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	2010-03-31 07:02:24 UTC (rev 27892)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2010-03-31 07:03:13 UTC (rev 27893)
@@ -3999,7 +3999,7 @@
 			ui_but_drop	(C, event, but, data);
 		}
 		/* handle keyframing */
-		else if(event->type == IKEY && event->val == KM_PRESS) {
+		else if(event->type == IKEY && !ELEM3(1, event->ctrl, event->oskey, event->shift) && event->val == KM_PRESS) {
 			if(event->alt)
 				ui_but_anim_delete_keyframe(C);
 			else
@@ -4010,7 +4010,7 @@
 			return WM_UI_HANDLER_BREAK;
 		}
 		/* handle drivers */
-		else if(event->type == DKEY && event->val == KM_PRESS) {
+		else if(event->type == DKEY && !ELEM3(1, event->ctrl, event->oskey, event->shift) && event->val == KM_PRESS) {
 			if(event->alt)
 				ui_but_anim_remove_driver(C);
 			else
@@ -4021,7 +4021,7 @@
 			return WM_UI_HANDLER_BREAK;
 		}
 		/* handle keyingsets */
-		else if(event->type == KKEY && event->val == KM_PRESS) {
+		else if(event->type == KKEY && !ELEM3(1, event->ctrl, event->oskey, event->shift) && event->val == KM_PRESS) {
 			if(event->alt)
 				ui_but_anim_remove_keyingset(C);
 			else