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:
authorClément Foucault <foucault.clem@gmail.com>2020-05-20 23:56:09 +0300
committerClément Foucault <foucault.clem@gmail.com>2020-05-20 23:56:09 +0300
commit8a0840b0ee9a60a62bf6d1f800d08bf852427fd5 (patch)
tree80344f42e0483345eef48796380dc7e5f229463b /source/blender/editors
parent71fa4601452756f3b4a26b51ec44f13edbf2e9a8 (diff)
parentaf3a55bb1b7d11c3036839d66fcf4280f1dae96b (diff)
Merge branch 'blender-v2.83-release'
# Conflicts: # source/blender/draw/engines/eevee/eevee_volumes.c
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/interface/view2d_draw.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/view2d_draw.c b/source/blender/editors/interface/view2d_draw.c
index 95fec2a10e9..36213f919a3 100644
--- a/source/blender/editors/interface/view2d_draw.c
+++ b/source/blender/editors/interface/view2d_draw.c
@@ -203,9 +203,9 @@ static void draw_parallel_lines(const ParallelLinesSet *lines,
immBindBuiltinProgram(GPU_SHADER_3D_POLYLINE_UNIFORM_COLOR);
immUniform2fv("viewportSize", &viewport[2]);
- /* 0.5f factor here is because the line is too fat due to the builtin antialiasing.
+ /* -1.0f offset here is because the line is too fat due to the builtin antialiasing.
* TODO make a variant or a uniform to toggle it off. */
- immUniform1f("lineWidth", 0.5f * U.pixelsize);
+ immUniform1f("lineWidth", U.pixelsize - 1.0f);
}
else {
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);