diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2018-05-06 19:29:49 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2018-05-06 19:36:47 +0300 |
commit | 48ddb2b98a5d9f77d5589afd137019dc85f1e460 (patch) | |
tree | 11ce871bf547dc713e925f08b5ff47a9281bcf9d /source/blender/draw/modes/shaders | |
parent | 1c3f953565cefd7d59499e0ea99c3fea5890357f (diff) |
Armature: Fix bone axes not using bone color.
Diffstat (limited to 'source/blender/draw/modes/shaders')
-rw-r--r-- | source/blender/draw/modes/shaders/armature_axes_vert.glsl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/draw/modes/shaders/armature_axes_vert.glsl b/source/blender/draw/modes/shaders/armature_axes_vert.glsl index 3a70c5d8515..fe6edba1316 100644 --- a/source/blender/draw/modes/shaders/armature_axes_vert.glsl +++ b/source/blender/draw/modes/shaders/armature_axes_vert.glsl @@ -9,7 +9,7 @@ in vec3 colorAxis; /* ---- Per instance Attribs ---- */ in mat4 InstanceModelMatrix; -in vec3 color; +in vec4 color; flat out vec4 finalColor; @@ -25,6 +25,6 @@ void main() gl_Position = ViewProjectionMatrix * vec4(wpos + spos, 1.0); - finalColor.rgb = mix(color, colorAxis, 0.9); + finalColor.rgb = mix(colorAxis, color.rgb, color.a); finalColor.a = 1.0; } |