blender/blender
151
479
Fork 710
Code Issues 6.7k Pull Requests 902 Projects 18 Wiki Activity

Fix #110632: temp context doesn't always restore original area or region at exit. #110787

Closed
Bastien Montagne wants to merge 1 commits from mont29:F-110632 into main
pull from: mont29:F-110632
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 2 Commits 1 Files Changed 1 +6 -3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a78e40bd3b - Show all commits

9
source/blender/python/intern/bpy_rna_context.cc
View File

@ -69,11 +69,14 @@ static PyObject *bpy_rna_context_temp_override_enter(BPyContextTempOverride *sel
CTX_py_state_push(C, &self->py_state, self->py_state_context_dict);
self->ctx_init.win = CTX_wm_window(C);
self->ctx_init.win_is_set = (self->ctx_init.win != self->ctx_temp.win);
self->ctx_init.win_is_set = (self->ctx_init.win != self->ctx_temp.win ||
self->ctx_temp.win_is_set);
self->ctx_init.area = CTX_wm_area(C);
self->ctx_init.area_is_set = (self->ctx_init.area != self->ctx_temp.area);
self->ctx_init.area_is_set = (self->ctx_init.area != self->ctx_temp.area ||
self->ctx_temp.area_is_set);
self->ctx_init.region = CTX_wm_region(C);
self->ctx_init.region_is_set = (self->ctx_init.region != self->ctx_temp.region);
self->ctx_init.region_is_set = (self->ctx_init.region != self->ctx_temp.region ||
self->ctx_temp.region_is_set);
wmWindow *win = self->ctx_temp.win_is_set ? self->ctx_temp.win : self->ctx_init.win;
bScreen *screen = win ? WM_window_get_active_screen(win) : nullptr;