griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.3-release'

Browse Source
This commit is contained in:
Omar Emara
2024-10-07 18:49:01 +03:00
parent 75819f991d 0a70360eb6
commit 0141c84b0d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/windowmanager/intern/wm_files.cc
View File

@@ -386,9 +386,6 @@ static void wm_file_read_setup_wm_use_new(bContext *C,
wm->init_flag = 0;
wm->winactive = nullptr;
/* Clearing drawable of old WM before deleting any context to avoid clearing the wrong wm. */
wm_window_clear_drawable(old_wm);
bool has_match = false;
LISTBASE_FOREACH (wmWindow *, win, &wm->windows) {
LISTBASE_FOREACH (wmWindow *, old_win, &old_wm->windows) {
@@ -407,6 +404,9 @@ static void wm_file_read_setup_wm_use_new(bContext *C,
static_cast<wmWindow *>(wm->windows.first));
}
/* Clearing drawable of old WM before deleting any context to avoid clearing the wrong wm. */
wm_window_clear_drawable(old_wm);
wm_setup_data->old_wm = nullptr;
wm_close_and_free(C, old_wm);
/* Don't handle user counts as this is only ever called once #G_MAIN has already been freed via