Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
m---------release/datafiles/locale0
m---------release/scripts/addons0
m---------release/scripts/addons_contrib0
-rw-r--r--source/blender/editors/space_view3d/view3d_draw.c5
m---------source/tools0
5 files changed, 2 insertions, 3 deletions
diff --git a/release/datafiles/locale b/release/datafiles/locale
-Subproject 4833954c0ac85cc407e1d5a153aa11b1d1823ec
+Subproject 8ce0741c51afec6a12b78c1ce21a7779e1f51c6
diff --git a/release/scripts/addons b/release/scripts/addons
-Subproject f86f25e62217264495d05f116ccb09d575fe984
+Subproject c0942837ab5a48482b1e901712f24cb1e1f04fa
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
-Subproject 5a82baad9f986722104280e8354a4427d8e9eab
+Subproject 42da56aa73726710107031787af5eea18679798
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