[Bf-blender-cvs] [39d0bf90444] master: Overlay: Fix wireframes being brighter because of color management

Clément Foucault noreply at git.blender.org
Sun Feb 23 14:32:52 CET 2020


Commit: 39d0bf90444ef42246f50c5346989780d01e20f4
Author: Clément Foucault
Date:   Sun Feb 23 14:32:34 2020 +0100
Branches: master
https://developer.blender.org/rB39d0bf90444ef42246f50c5346989780d01e20f4

Overlay: Fix wireframes being brighter because of color management

Also change the blending factors to make wireframe a bit darker in
unselected cases.

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

M	source/blender/draw/engines/overlay/shaders/wireframe_vert.glsl

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

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. */



More information about the Bf-blender-cvs mailing list