diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2018-09-05 16:42:32 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2018-09-05 20:00:12 +0300 |
| commit | c05b9bbcc09f15912c741809646902458ea27958 (patch) | |
| tree | 46ba357a536d171a46d300bcaba5ffac9ccae4fb /source/blender/draw/modes/shaders/edit_mesh_overlay_facefill_vert.glsl | |
| parent | e8dc73a0c9962bd0247ea45f6c28f5d5991d1d23 (diff) | |
Fix T56692: The edges are not highlighted in Mark Freestyle Edge
This was not ported yet.
Diffstat (limited to 'source/blender/draw/modes/shaders/edit_mesh_overlay_facefill_vert.glsl')
| -rw-r--r-- | source/blender/draw/modes/shaders/edit_mesh_overlay_facefill_vert.glsl | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/source/blender/draw/modes/shaders/edit_mesh_overlay_facefill_vert.glsl b/source/blender/draw/modes/shaders/edit_mesh_overlay_facefill_vert.glsl index c9de6d29524..40ea6b301b4 100644 --- a/source/blender/draw/modes/shaders/edit_mesh_overlay_facefill_vert.glsl +++ b/source/blender/draw/modes/shaders/edit_mesh_overlay_facefill_vert.glsl @@ -6,10 +6,20 @@ in ivec4 data; flat out vec4 faceColor; -#define FACE_SELECTED (1 << 3) +#define FACE_ACTIVE (1 << 2) +#define FACE_SELECTED (1 << 3) +#define FACE_FREESTYLE (1 << 4) void main() { gl_Position = ModelViewProjectionMatrix * vec4(pos, 1.0); - faceColor = ((data.x & FACE_SELECTED) != 0)? colorFaceSelect: colorFace; + + if ((data.x & FACE_ACTIVE) != 0) + faceColor = colorFaceSelect; + else if ((data.x & FACE_SELECTED) != 0) + faceColor = colorFaceSelect; + else if ((data.x & FACE_FREESTYLE) != 0) + faceColor = colorFaceFreestyle; + else + faceColor = colorFace; } |