Merge branch 'blender-v3.0-release'

This commit is contained in:
Campbell Barton 2021-11-02 22:06:35 +11:00
commit 7a4ee2fd4f
1 changed files with 12 additions and 0 deletions

View File

@ -769,6 +769,18 @@ static void wm_file_read_post(bContext *C, const struct wmFileReadPost_Params *p
WM_toolsystem_init(C);
}
}
/* Keep last. */
if (use_data) {
if (!G.background) {
/* Special case, when calling indirectly (from a Python script for example),
* the event loop wont run again to set the active window.
* Set the window here to allow scripts to continue running other operations, see: T92464. */
if (wm->op_undo_depth > 0) {
CTX_wm_window_set(C, wm->windows.first);
}
}
}
}
/** \} */