blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 758 Projects 19 Wiki Activity

Merge branch 'blender-v2.82-release'

This commit is contained in:
Campbell Barton 2020-01-28 16:46:09 +11:00
parent 9a4544762e 2a39fb1345
commit d4daecb223
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/windowmanager/intern/wm.c
View File

@ -275,6 +275,11 @@ void WM_check(bContext *C)
return;
}
/* Run before loading the keyconfig. */
if (wm->message_bus == NULL) {
wm->message_bus = WM_msgbus_create();
}
if (!G.background) {
/* case: fileread */
if ((wm->initialized & WM_WINDOW_IS_INITIALIZED) == 0) {
@ -286,10 +291,6 @@ void WM_check(bContext *C)
wm_window_ghostwindows_ensure(wm);
}
if (wm->message_bus == NULL) {
wm->message_bus = WM_msgbus_create();
}
/* case: fileread */
/* note: this runs in bg mode to set the screen context cb */
if ((wm->initialized & WM_WINDOW_IS_INITIALIZED) == 0) {