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
path: root/source
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2020-10-22 22:09:11 +0300
committerClément Foucault <foucault.clem@gmail.com>2020-10-23 03:02:41 +0300
commite58285dc1dc41312e9514963320648a0422c2ecb (patch)
treed0d652a21efcecfc4089ee56e177ad8d78e404a5 /source
parent8e060b44da04f4385a36a1a441e2ec45f1fd19f2 (diff)
Fix T73793 Walk navigation crosshair gets hidden behind objects
This was reintroduced by the wide line emulation workaround.
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/space_view3d/view3d_walk.c2
-rw-r--r--source/blender/gpu/intern/gpu_state.cc3
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/view3d_walk.c b/source/blender/editors/space_view3d/view3d_walk.c
index 1d89b040b85..3c9e4fa49b9 100644
--- a/source/blender/editors/space_view3d/view3d_walk.c
+++ b/source/blender/editors/space_view3d/view3d_walk.c
@@ -337,7 +337,7 @@ static void drawWalkPixel(const struct bContext *UNUSED(C), ARegion *region, voi
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
- immUniformThemeColor3(TH_VIEW_OVERLAY);
+ immUniformThemeColorAlpha(TH_VIEW_OVERLAY, 1.0f);
immBegin(GPU_PRIM_LINES, 8);
diff --git a/source/blender/gpu/intern/gpu_state.cc b/source/blender/gpu/intern/gpu_state.cc
index d0048ab9b87..fae196b202a 100644
--- a/source/blender/gpu/intern/gpu_state.cc
+++ b/source/blender/gpu/intern/gpu_state.cc
@@ -167,7 +167,8 @@ void GPU_depth_range(float near, float far)
void GPU_line_width(float width)
{
- SET_MUTABLE_STATE(line_width, width * PIXELSIZE);
+ width = max_ff(1.0f, width * PIXELSIZE);
+ SET_MUTABLE_STATE(line_width, width);
}
void GPU_point_size(float size)