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:
authorCampbell Barton <ideasman42@gmail.com>2019-02-14 05:39:18 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-02-14 07:22:58 +0300
commit9478ac701be110e8d61085158bf92e356b001cd4 (patch)
treed928c4b2ceb96a390c1aa676332b3e37e42335b7 /source/blender/draw
parent7280d9d1e41df9596608af77dc206573ed2d3e7a (diff)
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.
Diffstat (limited to 'source/blender/draw')
-rw-r--r--source/blender/draw/modes/shaders/paint_wire_vert.glsl10
1 files changed, 10 insertions, 0 deletions
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