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

Fix #110721: "show_gizmo" does not switch off all gizmos

Browse Source 
Not all gizmos were hidden when "show_gizmo" was disabled (most notably
python defined gizmos).
This was working in the 3DView and the Sequencer, but not respected in
the Clip Editor and Image/UV Editors.

Now check the flag prior to `WM_gizmomap_draw`.

Probably good for LTS.

Pull Request: https://projects.blender.org/blender/blender/pulls/110932
This commit is contained in:
Philipp Oeser
2023-08-09 08:31:15 +02:00
committed by Philipp Oeser
parent da0fef65c0
commit 36cd1755d2
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/space_clip/space_clip.cc
View File

@@ -783,8 +783,9 @@ static void clip_main_region_draw(const bContext *C, ARegion *region)
/* draw Grease Pencil - screen space only */
clip_draw_grease_pencil((bContext *)C, false);
}
WM_gizmomap_draw(region->gizmo_map, C, WM_GIZMOMAP_DRAWSTEP_2D);
if ((sc->gizmo_flag & SCLIP_GIZMO_HIDE) == 0) {
WM_gizmomap_draw(region->gizmo_map, C, WM_GIZMOMAP_DRAWSTEP_2D);
}
}
static void clip_main_region_listener(const wmRegionListenerParams *params)

5
source/blender/editors/space_image/space_image.cc
View File

@@ -720,8 +720,9 @@ static void image_main_region_draw(const bContext *C, ARegion *region)
nullptr,
C);
}
WM_gizmomap_draw(region->gizmo_map, C, WM_GIZMOMAP_DRAWSTEP_2D);
if ((sima->gizmo_flag & SI_GIZMO_HIDE) == 0) {
WM_gizmomap_draw(region->gizmo_map, C, WM_GIZMOMAP_DRAWSTEP_2D);
}
draw_image_cache(C, region);
}