[Bf-blender-cvs] [a31bd3f7b5c] master: Fix T73912: Highlight selected face option causes faces to fade out

Campbell Barton noreply at git.blender.org
Mon Feb 24 06:03:58 CET 2020


Commit: a31bd3f7b5cf27166ccdf3b33890533c5366eb4f
Author: Campbell Barton
Date:   Mon Feb 24 16:01:55 2020 +1100
Branches: master
https://developer.blender.org/rBa31bd3f7b5cf27166ccdf3b33890533c5366eb4f

Fix T73912: Highlight selected face option causes faces to fade out

Recent changes to color mixing require updates to the theme,
light overlays need to have their alpha reduced.

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

M	release/datafiles/userdef/userdef_default_theme.c

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

diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index df8fde40f3c..f5f16183d92 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -238,9 +238,9 @@ const bTheme U_theme_default = {
     .menu_shadow_fac = 0.3f,
     .menu_shadow_width = 4,
     .editor_outline = RGBA(0x1f1f1fff),
-    .widget_text_cursor = RGBA(0x3399e6ff),
     .icon_alpha = 1.0f,
     .icon_saturation = 0.5f,
+    .widget_text_cursor = RGBA(0x3399e6ff),
     .xaxis = RGBA(0xff3352ff),
     .yaxis = RGBA(0x8bdc00ff),
     .zaxis = RGBA(0x2890ffff),
@@ -324,11 +324,11 @@ const bTheme U_theme_default = {
     .edge_facesel = RGBA(0x4b4b4bff),
     .edge_crease = RGBA(0xcc0099ff),
     .edge_bevel = RGBA(0x00a5ffff),
-    .face = RGBA(0xffffff12),
-    .face_select = RGBA(0xffa5526c),
-    .face_dot = RGBA(0xff8a00ff),
+    .face = RGBA(0xffffff02),
+    .face_select = RGBA(0xffa5522e),
     .face_back = RGBA(0xff0000b3),
     .face_front = RGBA(0x0000ffb3),
+    .face_dot = RGBA(0xff8a00ff),
     .extra_edge_len = RGBA(0x150806ff),
     .extra_edge_angle = RGBA(0x4d4d00ff),
     .extra_face_angle = RGBA(0x0000ccff),
@@ -363,7 +363,7 @@ const bTheme U_theme_default = {
     .outline_width = 1,
     .obcenter_dia = 6,
     .facedot_size = 3,
-    .editmesh_active = RGBA(0xffffff80),
+    .editmesh_active = RGBA(0xffffff33),
     .clipping_border_3d = RGBA(0x313131ff),
     .bundle_solid = RGBA(0xc8c8c8ff),
     .camera_path = RGBA(0x000000ff),
@@ -490,7 +490,7 @@ const bTheme U_theme_default = {
     .info_property_text = RGBA(0xffffffff),
     .info_operator = RGBA(0x3ace87ff),
     .info_operator_text = RGBA(0xffffffff),
-    },
+  },
   .space_action = {
     .back = RGBA(0x42424200),
     .title = RGBA(0xeeeeeeff),



More information about the Bf-blender-cvs mailing list