blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 781 Projects 19 Wiki Activity

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

Merged
Philipp Oeser merged 1 commits from lichtwerk/blender:110721 into main 2023-08-09 08:31:22 +02:00
Conversation 0 Commits 1 Files Changed 2 +6 -4
2 changed files with 6 additions and 4 deletions
Show Stats 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);
}