diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-14 02:18:01 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-14 02:18:01 +0300 |
| commit | 948256442b27a640c5ec87563ef1f12333d32e21 (patch) | |
| tree | 39e718524d76bbf56dab4b5f299efd62bf963d33 /source/blender/editors/space_view3d/view3d_draw.c | |
| parent | 9ea645862cfb967376bb7ae2c7f7ef8a5fe90637 (diff) | |
Fix T59337: Camera visual aids ignore overlay
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_draw.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index f6b2c79b88b..05debeef88d 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -515,6 +515,11 @@ static void drawviewborder(Scene *scene, Depsgraph *depsgraph, ARegion *ar, View immUnbindProgram(); } + /* When overlays are disabled, only show camera outline & passepartout. */ + if (v3d->flag2 & V3D_RENDER_OVERRIDE) { + return; + } + /* And now, the dashed lines! */ immBindBuiltinProgram(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR); @@ -537,7 +542,7 @@ static void drawviewborder(Scene *scene, Depsgraph *depsgraph, ARegion *ar, View imm_draw_box_wire_2d(shdr_pos, x1i, y1i, x2i, y2i); } - /* border */ + /* Render Border. */ if (scene->r.mode & R_BORDER) { float x3, y3, x4, y4; @@ -664,7 +669,7 @@ static void drawviewborder(Scene *scene, Depsgraph *depsgraph, ARegion *ar, View /* end dashed lines */ /* camera name - draw in highlighted text color */ - if (ca && (ca->flag & CAM_SHOWNAME)) { + if (ca && ((v3d->overlay.flag & V3D_OVERLAY_HIDE_TEXT) == 0) && (ca->flag & CAM_SHOWNAME)) { UI_FontThemeColor(BLF_default(), TH_TEXT_HI); BLF_draw_default( x1i, y1i - (0.7f * U.widget_unit), 0.0f, |