[Bf-blender-cvs] [3468434b6ba] master: Theme: adjust active UV face color in the theme

Campbell Barton noreply at git.blender.org
Thu Apr 16 10:47:30 CEST 2020


Commit: 3468434b6bafd47abfbf80159c51d1fce453b95b
Author: Campbell Barton
Date:   Thu Apr 16 18:43:03 2020 +1000
Branches: master
https://developer.blender.org/rB3468434b6bafd47abfbf80159c51d1fce453b95b

Theme: adjust active UV face color in the theme

This color had it's alpha reduced in the drawing code,
as the active face is no longer stippled.

Now the color is used from the theme without adjusting the alpha.

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

M	release/datafiles/userdef/userdef_default_theme.c
M	release/scripts/presets/interface_theme/blender_light.xml
M	source/blender/editors/uvedit/uvedit_draw.c

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

diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index 23d958de021..4d48bb8eaac 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -697,7 +697,7 @@ const bTheme U_theme_default = {
     .vertex_size = 3,
     .outline_width = 1,
     .facedot_size = 3,
-    .editmesh_active = RGBA(0xffffff80),
+    .editmesh_active = RGBA(0xffffff40),
     .handle_vertex_select = RGBA(0xffff00ff),
     .handle_vertex_size = 5,
     .gp_vertex_size = 3,
diff --git a/release/scripts/presets/interface_theme/blender_light.xml b/release/scripts/presets/interface_theme/blender_light.xml
index f4ec8233df3..48ad0a8367e 100644
--- a/release/scripts/presets/interface_theme/blender_light.xml
+++ b/release/scripts/presets/interface_theme/blender_light.xml
@@ -724,7 +724,7 @@
         freestyle_face_mark="#7fff7f33"
         face_back="#00000000"
         face_front="#00000000"
-        editmesh_active="#ffffff80"
+        editmesh_active="#ffffff40"
         wire_edit="#c0c0c0"
         edge_select="#ff8500"
         scope_back="#727272ff"
diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c
index 0fd3005ac41..959ca1eeef1 100644
--- a/source/blender/editors/uvedit/uvedit_draw.c
+++ b/source/blender/editors/uvedit/uvedit_draw.c
@@ -347,7 +347,6 @@ static void draw_uvs(SpaceImage *sima,
       UI_GetThemeColor4fv(TH_FACE, col1);
       UI_GetThemeColor4fv(TH_FACE_SELECT, col2);
       UI_GetThemeColor4fv(TH_EDITMESH_ACTIVE, col3);
-      col3[3] *= 0.2; /* Simulate dithering */
 
       col1[3] *= overlay_alpha;
       col2[3] *= overlay_alpha;



More information about the Bf-blender-cvs mailing list