From 30168752cf0f4c9b43f8450ef82bbbc421c86eef Mon Sep 17 00:00:00 2001 From: Harley Acheson Date: Sat, 1 Jun 2024 19:19:58 +0200 Subject: [PATCH] Fix #122590: Revert "Fix #122423: Fix Gizmo Map Crash after Area Join" This reverts commit e48eacd6727acf153025f5dfdb872c1659d33530. Pull Request: https://projects.blender.org/blender/blender/pulls/122604 --- source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc index d66fd153294..d550beaf10a 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc @@ -818,16 +818,16 @@ void WM_gizmomap_add_handlers(ARegion *region, wmGizmoMap *gzmap) void wm_gizmomaps_handled_modal_update(bContext *C, wmEvent *event, wmEventHandler_Op *handler) { const bool modal_running = (handler->op != nullptr); - ARegion *region = CTX_wm_region(C); /* Happens on render or when joining areas. */ - if (!region || !handler->context.region || !handler->context.region->gizmo_map) { + if (!handler->context.region || !handler->context.region->gizmo_map) { return; } wmGizmoMap *gzmap = handler->context.region->gizmo_map; wmGizmo *gz = wm_gizmomap_modal_get(gzmap); ScrArea *area = CTX_wm_area(C); + ARegion *region = CTX_wm_region(C); wm_gizmomap_handler_context_op(C, handler);