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-02-23 16:32:34 +0300
committerClément Foucault <foucault.clem@gmail.com>2020-02-23 16:32:34 +0300
commit39d0bf90444ef42246f50c5346989780d01e20f4 (patch)
tree26f7037345cff76223cf8c0c6a1c9274ffdc4020 /source/blender
parentc26f470cfeea628bf7911dcd663a67e0f8052391 (diff)
Overlay: Fix wireframes being brighter because of color management
Also change the blending factors to make wireframe a bit darker in unselected cases.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/draw/engines/overlay/shaders/wireframe_vert.glsl9
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/draw/engines/overlay/shaders/wireframe_vert.glsl b/source/blender/draw/engines/overlay/shaders/wireframe_vert.glsl
index 4d705a4ee2b..31ac9a2b181 100644
--- a/source/blender/draw/engines/overlay/shaders/wireframe_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/wireframe_vert.glsl
@@ -138,9 +138,12 @@ void main()
facing = clamp(abs(facing), 0.0, 1.0);
- vec3 final_front_col = mix(rim_col, wire_col, 0.4);
- vec3 final_rim_col = mix(rim_col, wire_col, 0.1);
- finalColor = mix(final_rim_col, final_front_col, facing);
+ /* Do interpolation in a non-linear space to have a better visual result. */
+ rim_col = pow(rim_col, vec3(1.0 / 2.2));
+ wire_col = pow(wire_col, vec3(1.0 / 2.2));
+ vec3 final_front_col = mix(rim_col, wire_col, 0.35);
+ finalColor = mix(rim_col, final_front_col, facing);
+ finalColor = pow(finalColor, vec3(2.2));
#endif
/* Cull flat edges below threshold. */