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

Fix #145084: Crash opening a file and removing a scene from Python

Browse Source 
Don't rely on the contexts window to ensure windows have their
scene updated when removing, since the window may be cleared and
there may be multiple windows.
This commit is contained in:
Campbell Barton
2025-08-26 21:54:17 +00:00
parent 494c32735f
commit 60a6f5bde4
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/makesrna/intern/rna_main_api.cc
View File

@@ -179,15 +179,28 @@ static void rna_Main_scenes_remove(
if (BKE_scene_can_be_removed(bmain, scene)) {
Scene *scene_new = static_cast<Scene *>(scene->id.prev ? scene->id.prev : scene->id.next);
if (do_unlink) {
wmWindow *win = CTX_wm_window(C);
/* Don't rely on `CTX_wm_window(C)` as it may have been cleared,
* yet windows may still be open that reference this scene. */
wmWindowManager *wm = static_cast<wmWindowManager *>(bmain->wm.first);
LISTBASE_FOREACH (wmWindow *, win, &wm->windows) {
if (WM_window_get_active_scene(win) == scene) {
# ifdef WITH_PYTHON
BPy_BEGIN_ALLOW_THREADS;
# endif
if (WM_window_get_active_scene(win) == scene) {
WM_window_set_active_scene(bmain, C, win, scene_new);
# ifdef WITH_PYTHON
BPy_END_ALLOW_THREADS;
# endif
}
}
if (CTX_data_scene(C) == scene) {
# ifdef WITH_PYTHON
BPy_BEGIN_ALLOW_THREADS;
# endif
WM_window_set_active_scene(bmain, C, win, scene_new);
CTX_data_scene_set(C, scene_new);
# ifdef WITH_PYTHON
BPy_END_ALLOW_THREADS;