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

Fix #122590: Revert "Fix #122423: Fix Gizmo Map Crash after Area Join"

Browse Source 
This reverts commit e48eacd672.

Pull Request: https://projects.blender.org/blender/blender/pulls/122604
This commit is contained in:
Harley Acheson
2024-06-01 19:19:58 +02:00
committed by Harley Acheson
parent 46ace12a46
commit 30168752cf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc
View File

@@ -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);