[Bf-blender-cvs] [d55e1caa75c] blender-v3.2-release: Fix T98185: Assertion saving while fullscreen
Campbell Barton
noreply at git.blender.org
Tue May 24 03:01:23 CEST 2022
Commit: d55e1caa75c97ad6f77f17202ca6a7fa0623b853
Author: Campbell Barton
Date: Tue May 17 15:15:35 2022 +1000
Branches: blender-v3.2-release
https://developer.blender.org/rBd55e1caa75c97ad6f77f17202ca6a7fa0623b853
Fix T98185: Assertion saving while fullscreen
When saving from the menu the region was not set,
causing the last region in `area->regionbase` to be used
as the region was assigned before comparison.
===================================================================
M source/blender/windowmanager/intern/wm_event_system.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 1648bdfb9d4..c806472103d 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -1960,12 +1960,9 @@ static void wm_handler_op_context_get_if_valid(bContext *C,
region = NULL;
}
- if (region == NULL) {
- LISTBASE_FOREACH (ARegion *, region_iter, &area->regionbase) {
- region = region_iter;
- if (region == handler->context.region) {
- break;
- }
+ if ((region == NULL) && handler->context.region) {
+ if (BLI_findindex(&area->regionbase, handler->context.region) != -1) {
+ region = handler->context.region;
}
}
More information about the Bf-blender-cvs
mailing list