blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Fix camera border bug in passepartout render view 

{F10761402}

With active viewport render from camera view, the camera border shows up, even when passepartout and overlays are disabled.

By moving the line-drawing code to the passepartout section, it is effectively disabled when passepartout is off.

Reviewed By: sebastian_k

Differential Revision: https://developer.blender.org/D12745
This commit is contained in:
Simon Lenz 2021-10-04 12:21:20 +02:00 committed by Dalai Felinto
parent 23d9953c80
commit e62ce9e08e
Notes: blender-bot 2023-02-14 05:28:01 +01:00 
Referenced by commit dc4c2815a6, Cleanup: Reverting submodules hash
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/datafiles/locale

@ -1 +1 @@
Subproject commit 4833954c0ac85cc407e1d5a153aa11b1d1823ec0
Subproject commit 8ce0741c51afec6a12b78c1ce21a7779e1f51c69

2
release/scripts/addons

@ -1 +1 @@
Subproject commit f86f25e62217264495d05f116ccb09d575fe9841
Subproject commit c0942837ab5a48482b1e901712f24cb1e1f04fac

2
release/scripts/addons_contrib

@ -1 +1 @@
Subproject commit 5a82baad9f986722104280e8354a4427d8e9eab1
Subproject commit 42da56aa73726710107031787af5eea186797984

5
source/blender/editors/space_view3d/view3d_draw.c
View File

@ -608,11 +608,10 @@ static void drawviewborder(Scene *scene, Depsgraph *depsgraph, ARegion *region,
}
GPU_blend(GPU_BLEND_NONE);
immUniformThemeColor3(TH_BACK);
imm_draw_box_wire_2d(shdr_pos, x1i, y1i, x2i, y2i);
}
immUniformThemeColor3(TH_BACK);
imm_draw_box_wire_2d(shdr_pos, x1i, y1i, x2i, y2i);
#ifdef VIEW3D_CAMERA_BORDER_HACK
if (view3d_camera_border_hack_test == true) {
immUniformColor3ubv(view3d_camera_border_hack_col);

2
source/tools

@ -1 +1 @@
Subproject commit 01f51a0e551ab730f0934dc6488613690ac4bf8f
Subproject commit 3f12d0ae601a5632d971f711c355e58bd28d21dc