diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-05-25 18:57:17 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-05-25 18:57:17 +0400 |
commit | d236f8d45011bddb2517beace092f80bec279c13 (patch) | |
tree | 148a87f45e4f4065aa428f70f4390f611b83e3bb /source | |
parent | 352cd241a3fd203841cb8ec7621f53187d0790c8 (diff) |
Fix #31514: Open blends via drag-n'-drop doesn't work when splash screen is on
Do not block EVT_DROP event from popup handler.
Not ideal solution sine it'll be much nicer to cleanup event handling order,
but should be acceptable for now.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 428ddb3059f..58dfabd99ce 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -6574,7 +6574,16 @@ static int ui_handler_popup(bContext *C, wmEvent *event, void *userdata) /* delayed apply callbacks */ ui_apply_but_funcs_after(C); - /* we block all events, this is modal interaction */ + if (event->type == EVT_DROP) { + /* if we're handling drop event we'll want it to be handled by popup callee as well, + * so it'll be possible to perform such operations as opening .blend files by dropping + * them into blender even if there's opened popup like splash screen (sergey) + */ + + return WM_UI_HANDLER_CONTINUE; + } + + /* we block all events, this is modal interaction, except for drop events which is described above */ return WM_UI_HANDLER_BREAK; } |