blender
/
blender
135
420
Fork 603
Code Issues 6.3k Pull Requests 754 Projects 19 Wiki Activity

blender-v3.6-release backports #111957

Merged
Philipp Oeser merged 10 commits from lichtwerk/blender:blender-v3.6-release into blender-v3.6-release 2023-09-05 12:27:20 +02:00
Conversation 3 Commits 10 Files Changed 12 +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
Showing only changes of commit c5fd621240 - Show all commits

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

@ -770,8 +770,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.c
View File

@ -721,8 +721,9 @@ static void image_main_region_draw(const bContext *C, ARegion *region)
NULL,
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);
}