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:
authorJeroen Bakker <j.bakker@atmind.nl>2018-06-14 09:51:42 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2018-06-14 15:18:52 +0300
commit277d90127417881a13be6b8c8db46fb4339391e9 (patch)
treecb77c17d0a29b0f46cee4fffc702ffe0559aabe3 /source/blender/draw/modes/shaders/edit_mesh_overlay_geom_tri.glsl
parent158930228d6b4a62e74d836803793ff5b1a309d7 (diff)
T55456 EditMeshMode
- see the face selection color when face is active - test different masks for active face, finally chosen for no mask at all.
Diffstat (limited to 'source/blender/draw/modes/shaders/edit_mesh_overlay_geom_tri.glsl')
-rw-r--r--source/blender/draw/modes/shaders/edit_mesh_overlay_geom_tri.glsl2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/modes/shaders/edit_mesh_overlay_geom_tri.glsl b/source/blender/draw/modes/shaders/edit_mesh_overlay_geom_tri.glsl
index a22cc56c74f..7e778c325a6 100644
--- a/source/blender/draw/modes/shaders/edit_mesh_overlay_geom_tri.glsl
+++ b/source/blender/draw/modes/shaders/edit_mesh_overlay_geom_tri.glsl
@@ -167,7 +167,7 @@ void main()
/* Face */
if ((vData[0].x & FACE_ACTIVE) != 0)
- faceColor = colorEditMeshActive;
+ faceColor = colorFaceSelect;
else if ((vData[0].x & FACE_SELECTED) != 0)
faceColor = colorFaceSelect;
else