fix for drag-n-drop ID's for renaming (own fault when fixing #24016)
authorCampbell Barton <ideasman42@gmail.com>
Tue, 11 Oct 2011 10:59:52 +0000 (10:59 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 11 Oct 2011 10:59:52 +0000 (10:59 +0000)
source/blender/editors/interface/interface_handlers.c

index 6417a6b58ddb9e063ae93a406e23c0d2fecb5ddd..9af9b2f55ad2e905cb0551983b5c56a5f90cabd5 100644 (file)
@@ -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)) {