blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Fix own mistake from 4cb4556fa5 

Trying to close Blender from a second window wouldn't work, the first window
would have to be hovered first. Ouch!
This commit is contained in:
Julian Eisel 2018-03-22 23:52:38 +01:00
parent a4ea46ffc5
commit aeec19d2e7
Notes: blender-bot 2023-02-14 06:05:26 +01:00 
Referenced by issue #54406, Boolean Union Bug
Referenced by issue #54410, "Add simple UVs" unwrap different in Blender 2.79 from master
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/windowmanager/WM_api.h
View File

@ -186,7 +186,7 @@ enum {
struct wmEventHandler *WM_event_add_dropbox_handler(ListBase *handlers, ListBase *dropboxes);
/* mouse */
void WM_event_add_mousemove(struct bContext *C);
void WM_event_add_mousemove(const struct bContext *C);
bool WM_event_is_modal_tweak_exit(const struct wmEvent *event, int tweak_event);
bool WM_event_is_last_mousemove(const struct wmEvent *event);

2
source/blender/windowmanager/intern/wm_event_system.c
View File

@ -2919,7 +2919,7 @@ static void WM_event_remove_handler(ListBase *handlers, wmEventHandler *handler)
}
#endif
void WM_event_add_mousemove(bContext *C)
void WM_event_add_mousemove(const bContext *C)
{
wmWindow *window = CTX_wm_window(C);

5
source/blender/windowmanager/intern/wm_init_exit.c
View File

@ -450,12 +450,11 @@ void wm_exit_schedule_delayed(const bContext *C)
/* What we do here is a little bit hacky, but quite simple and doesn't require bigger
* changes: Add a handler wrapping WM_exit() to cause a delayed call of it. */
wmWindowManager *wm = CTX_wm_manager(C);
/* Doesn't matter which window we use. */
wmWindow *win = wm->windows.first;
wmWindow *win = CTX_wm_window(C);
/* Use modal UI handler for now. Could add separate WM handlers or so, but probably not worth it. */
WM_event_add_ui_handler(C, &win->modalhandlers, wm_exit_handler, NULL, NULL, 0);
WM_event_add_mousemove(C); /* ensure handler actually gets called */
}
/**