bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Fix #116297: Context override error passing in a window without a screen

Browse Source 
When overriding the contexts window but not the screen, the context
override would attempt to use the current screen with the new window.

This raised an error and could crash when editing properties in the
key-map editor for the "context toggle" operator.
This commit is contained in:
Campbell Barton 2023-12-19 11:09:28 +11:00
parent 9f05144fc9
commit 69d22a42d0
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,6 +164,13 @@ static PyObject *bpy_rna_context_temp_override_enter(BPyContextTempOverride *sel
self->ctx_init.area_is_set = (self->ctx_init.area != area);
self->ctx_init.region_is_set = (self->ctx_init.region != region);
/* When the screen isn't passed but a window is, match the screen to the window,
* it's important to do this after setting `self->ctx_init.screen_is_set` because the screen is
* *not* set, only the window, restoring the window will also restore its screen, see #116297. */
if ((self->ctx_temp.win_is_set == true) && (self->ctx_temp.screen_is_set == false)) {
screen = win ? WM_window_get_active_screen(win) : nullptr;
}
/* NOTE(@ideasman42): Regarding sanity checks.
* There are 3 different situations to be accounted for here regarding overriding windowing data.
*