diff options
| author | Simon Lenz <Amudtogal> | 2021-10-04 13:21:20 +0300 |
|---|---|---|
| committer | Dalai Felinto <dalai@blender.org> | 2021-10-04 13:21:40 +0300 |
| commit | e62ce9e08e919f25aad444f378947f6be932730f (patch) | |
| tree | b5844052d1b74574e83dce27b3dc64c06414d88d /source | |
| parent | 23d9953c807f3376212b1a0a31f7a7669e9eb1ac (diff) | |
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
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 5 | ||||
| m--------- | source/tools | 0 |
2 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 86f79718a68..79148035a25 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -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); diff --git a/source/tools b/source/tools -Subproject 01f51a0e551ab730f0934dc6488613690ac4bf8 +Subproject 3f12d0ae601a5632d971f711c355e58bd28d21d |