diff options
| author | Ton Roosendaal <ton@blender.org> | 2011-01-03 20:00:49 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2011-01-03 20:00:49 +0300 |
| commit | be5f30416b34f6928b629dda44a3f1f071d054cb (patch) | |
| tree | ba014b7532ab3b9cb7f6e8686b152afcb097a689 /source/blender/windowmanager | |
| parent | e86a489327190cfe87c98067da53fe40d6778bd1 (diff) | |
Todo item
Drag/drop now has a User preset for dragging threshold.
Noticed this was set to 3 pixels even, made it 5 as default.
Tablet owners can put it larger too :)
Note: the tweak-threshold (3d win) is 10 pixels now, I think
this needs another preset too, leave this for now.
Also: fixed crash in filewindow: drag .blend icon and drop it.
You can't test anything in Blender or you get a bug :)
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 84c78669c64..7ad52f8fcb1 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -1478,7 +1478,10 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers) //wm_operator_invoke(C, drop->ot, event, drop->ptr, NULL, FALSE); action |= WM_HANDLER_BREAK; - /* prevent hanging on file read */ + /* XXX fileread case */ + if(CTX_wm_window(C)==NULL) + return action; + BLI_freelistN(event->customdata); event->customdata= NULL; event->custom= 0; @@ -1501,7 +1504,7 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers) } } - /* fileread case */ + /* XXX fileread case */ if(CTX_wm_window(C)==NULL) return action; } |