From be5f30416b34f6928b629dda44a3f1f071d054cb Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Mon, 3 Jan 2011 17:00:49 +0000 Subject: 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 :) --- source/blender/windowmanager/intern/wm_event_system.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'source/blender/windowmanager') 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; } -- cgit v1.2.3