fix for drag-n-drop ID's for renaming (own fault when fixing #24016)

This commit is contained in:
Campbell Barton 2011-10-11 10:59:52 +00:00
parent f7b922fe93
commit 79f21f88c2

@ -4429,7 +4429,7 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, wmEvent *event)
/* check prevval because of modal operators [#24016], /* check prevval because of modal operators [#24016],
* modifier check is to allow Ctrl+C for copy. * modifier check is to allow Ctrl+C for copy.
* if this causes other problems, remove this check and suffer the bug :) - campbell */ * 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 */ /* handle copy-paste */
if(ELEM(event->type, CKEY, VKEY) && event->val==KM_PRESS && (event->ctrl || event->oskey)) { if(ELEM(event->type, CKEY, VKEY) && event->val==KM_PRESS && (event->ctrl || event->oskey)) {