[Bf-blender-cvs] [e62ce9e08e9] master: Fix camera border bug in passepartout render view

[Simon Lenz]

Commit: e62ce9e08e919f25aad444f378947f6be932730f
Author: Simon Lenz
Date:   Mon Oct 4 12:21:20 2021 +0200
Branches: master
https://developer.blender.org/rBe62ce9e08e919f25aad444f378947f6be932730f

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

===================================================================

M	release/datafiles/locale
M	release/scripts/addons
M	release/scripts/addons_contrib
M	source/blender/editors/space_view3d/view3d_draw.c
M	source/tools

===================================================================

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 4833954c0ac..8ce0741c51a 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 4833954c0ac85cc407e1d5a153aa11b1d1823ec0
+Subproject commit 8ce0741c51afec6a12b78c1ce21a7779e1f51c69
diff --git a/release/scripts/addons b/release/scripts/addons
index f86f25e6221..c0942837ab5 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit f86f25e62217264495d05f116ccb09d575fe9841
+Subproject commit c0942837ab5a48482b1e901712f24cb1e1f04fac
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 5a82baad9f9..42da56aa737 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 5a82baad9f986722104280e8354a4427d8e9eab1
+Subproject commit 42da56aa73726710107031787af5eea186797984
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
index 01f51a0e551..3f12d0ae601 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 01f51a0e551ab730f0934dc6488613690ac4bf8f
+Subproject commit 3f12d0ae601a5632d971f711c355e58bd28d21dc