diff options
| author | Matt Ebb <matt@mke3.net> | 2010-03-31 11:03:13 +0400 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2010-03-31 11:03:13 +0400 |
| commit | 7af91f6663564f1c3c85960b95f2c6e3ca213231 (patch) | |
| tree | 0530d8f4cca6b69995630a9b6a7bb03658b3dd45 /source/blender/editors/interface | |
| parent | cc29dcec69978fddcd6701403094ae298ae852c2 (diff) | |
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.
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index b9cb83b4ebb..2f14d23b518 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -3999,7 +3999,7 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, wmEvent *event) 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 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, wmEvent *event) 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 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, wmEvent *event) 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 |