diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-10-11 14:59:52 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-11 14:59:52 +0400 |
| commit | 79f21f88c2be305962f6432bf8b1af94056fd92b (patch) | |
| tree | 170749ba1ad5da806953643773e711c6dc554890 /source | |
| parent | f7b922fe938bfdaa20b62fe440c6aa0b45d40b22 (diff) | |
fix for drag-n-drop ID's for renaming (own fault when fixing #24016)
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 6417a6b58dd..9af9b2f55ad 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -4429,7 +4429,7 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, wmEvent *event) /* check prevval because of modal operators [#24016], * modifier check is to allow Ctrl+C for copy. * if this causes other problems, remove this check and suffer the bug :) - campbell */ - (event->prevval != KM_PRESS || ISKEYMODIFIER(event->prevtype)) + ((event->prevval != KM_PRESS) || (ISKEYMODIFIER(event->prevtype)) || (event->type == EVT_DROP)) ) { /* handle copy-paste */ if(ELEM(event->type, CKEY, VKEY) && event->val==KM_PRESS && (event->ctrl || event->oskey)) { |