Merging trunk up to rev 40959
[blender.git] / source / blender / editors / interface / interface_handlers.c
index 3b505005adda0b25b0b9d4c5ce903bb0ad47e02a..29b270df5dbd0c823bc9dd59f3fea90ead9b5cfe 100644 (file)
@@ -4522,7 +4522,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)) {