[Bf-blender-cvs] [9478ac701be] master: DRW: use light wire for weight paint mode
Campbell Barton
noreply at git.blender.org
Thu Feb 14 05:24:52 CET 2019
Commit: 9478ac701be110e8d61085158bf92e356b001cd4
Author: Campbell Barton
Date: Thu Feb 14 13:39:18 2019 +1100
Branches: master
https://developer.blender.org/rB9478ac701be110e8d61085158bf92e356b001cd4
DRW: use light wire for weight paint mode
Black wire can be hard to see against dark blue,
especially when shading is enabled.
Use light grey, matches 2.7x.
===================================================================
M source/blender/draw/modes/shaders/paint_wire_vert.glsl
===================================================================
diff --git a/source/blender/draw/modes/shaders/paint_wire_vert.glsl b/source/blender/draw/modes/shaders/paint_wire_vert.glsl
index 64b58fb3673..b415be7841c 100644
--- a/source/blender/draw/modes/shaders/paint_wire_vert.glsl
+++ b/source/blender/draw/modes/shaders/paint_wire_vert.glsl
@@ -32,7 +32,17 @@ void main()
const vec4 colSel = vec4(1.0, 1.0, 1.0, 1.0);
#endif
+#ifdef USE_SELECT
finalColor = (is_select) ? colSel : colorWire;
+#else
+# ifdef VERTEX_MODE
+ finalColor = colorWire;
+# else
+ /* Weight paint needs a light color to contrasts with dark weights. */
+ finalColor.xyz = vec3(0.8, 0.8, 0.8);
+# endif
+#endif
+
finalColor.a = nor.w;
#ifdef USE_WORLD_CLIP_PLANES
More information about the Bf-blender-cvs
mailing list