[Bf-blender-cvs] [2299e6d9bad] master: Fix active face-dot color

Campbell Barton noreply at git.blender.org
Wed Jun 19 02:45:04 CEST 2019


Commit: 2299e6d9bad4f707110cdf8e1b5affd6f1088826
Author: Campbell Barton
Date:   Wed Jun 19 10:42:32 2019 +1000
Branches: master
https://developer.blender.org/rB2299e6d9bad4f707110cdf8e1b5affd6f1088826

Fix active face-dot color

Unlike edge/vert this was blending with the regular selection color.

===================================================================

M	source/blender/draw/modes/shaders/edit_mesh_overlay_common_lib.glsl

===================================================================

diff --git a/source/blender/draw/modes/shaders/edit_mesh_overlay_common_lib.glsl b/source/blender/draw/modes/shaders/edit_mesh_overlay_common_lib.glsl
index 6aa20a9d21b..b79bae45f23 100644
--- a/source/blender/draw/modes/shaders/edit_mesh_overlay_common_lib.glsl
+++ b/source/blender/draw/modes/shaders/edit_mesh_overlay_common_lib.glsl
@@ -65,7 +65,7 @@ vec4 EDIT_MESH_face_color(int face_flag)
 vec4 EDIT_MESH_facedot_color(float facedot_flag)
 {
   if (facedot_flag < 0.0f) {
-    return colorEditMeshActive;
+    return vec4(colorEditMeshActive.xyz, 1.0);
   }
   else if (facedot_flag > 0.0f) {
     return colorFaceDot;



More information about the Bf-blender-cvs mailing list