diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2018-05-05 21:27:22 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2018-05-05 22:04:21 +0300 |
commit | 3b075d0c8d86551e74672866a1a210adb9f24c24 (patch) | |
tree | bb67c759863bb1dac8e6365329acb68f7d9e945a /source/blender/draw/modes/shaders/armature_envelope_outline_vert.glsl | |
parent | eec3fc1273e6c02ab5749a054261287fb0da0f89 (diff) |
Armature: Make bone outlines thickness variable.
Diffstat (limited to 'source/blender/draw/modes/shaders/armature_envelope_outline_vert.glsl')
-rw-r--r-- | source/blender/draw/modes/shaders/armature_envelope_outline_vert.glsl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/draw/modes/shaders/armature_envelope_outline_vert.glsl b/source/blender/draw/modes/shaders/armature_envelope_outline_vert.glsl index e534e8cef1d..a836d7fa9e1 100644 --- a/source/blender/draw/modes/shaders/armature_envelope_outline_vert.glsl +++ b/source/blender/draw/modes/shaders/armature_envelope_outline_vert.glsl @@ -16,7 +16,7 @@ in vec2 pos2; /* Assumed to be in world coordinate already. */ in vec4 headSphere; in vec4 tailSphere; -in vec4 color; +in vec4 outlineColorSize; in vec3 xAxis; flat out vec4 finalColor; @@ -145,12 +145,12 @@ void main() vec2 edge_dir = compute_dir(ss0, ss1, ss2); bool outer = ((gl_VertexID & 1) == 1); - vec2 t = lineThickness / viewportSize; + vec2 t = outlineColorSize.w * (lineThickness / viewportSize); t *= pres_fac; t = (outer) ? t : vec2(0.0); gl_Position = p1; gl_Position.xy += t * edge_dir; - finalColor = color; + finalColor = vec4(outlineColorSize.rgb, 1.0); } |