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

Merge branch 'blender-v4.1-release'

Browse Source
This commit is contained in:
Campbell Barton
2024-03-11 17:36:36 +11:00
parent 443e9cba90 5fe0213659
commit 7b4fb47298
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -427,12 +427,14 @@ static PyObject *bpy_rna_context_temp_override_exit(BPyContextTempOverride *self
do_restore = false;
}
if (self->ctx_init.region_is_set || is_container_set) {
CTX_wm_region_set(C, self->ctx_init.region);
is_container_set = true;
}
else if (self->ctx_temp.region_is_set) {
is_container_set = true;
if (do_restore) {
if (self->ctx_init.region_is_set || is_container_set) {
CTX_wm_region_set(C, self->ctx_init.region);
is_container_set = true;
}
else if (self->ctx_temp.region_is_set) {
is_container_set = true;
}
}
}
UNUSED_VARS(is_container_set);