[Bf-blender-cvs] [5827a47280a] master: Theme: match outliner/properties colors with modes in viewport.

Pablo Vazquez noreply at git.blender.org
Wed May 15 19:12:30 CEST 2019


Commit: 5827a47280a0128d0fc47b7c5609058a472bf29f
Author: Pablo Vazquez
Date:   Wed May 15 19:11:14 2019 +0200
Branches: master
https://developer.blender.org/rB5827a47280a0128d0fc47b7c5609058a472bf29f

Theme: match outliner/properties colors with modes in viewport.

Helps to:
* Make a connection between what we see in Outliner, Viewport and Properties editor
  (clicking on the obdata icon takes us to Edit mode, which shares colors).
* Quickly tell which mode we are in.
* Armatures have now distinct color when in Object, Edit, and Pose modes.

Missing is Pose mode which is currently cyan in the viewport and obdata category in properties,
it would probably need its own special category though as it doesn't match the others.

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

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 c13e31c9092..7a9f92eb485 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -249,9 +249,9 @@ const bTheme U_theme_default = {
     .gizmo_a = RGBA(0x4da84dff),
     .gizmo_b = RGBA(0xa33535ff),
     .icon_scene = RGBA(0xe6e6e6ff),
-    .icon_collection = RGBA(0xe6e6e6ff),
-    .icon_object = RGBA(0xe49759ff),
-    .icon_object_data = RGBA(0x89e689ff),
+    .icon_collection = RGBA(0xf4f4f4ff),
+    .icon_object = RGBA(0xee9e5dff),
+    .icon_object_data = RGBA(0x00d4a3ff),
     .icon_modifier = RGBA(0x84b8ffff),
     .icon_shading = RGBA(0xff6060ff),
   },
@@ -305,44 +305,44 @@ const bTheme U_theme_default = {
     .grid = RGBA(0xa7a7a733),
     .wire = RGBA(0x000000ff),
     .wire_edit = RGBA(0x000000ff),
-    .select = RGBA(0xed5700ff),
+    .select = RGBA(0xcc5d00ff),
     .lamp = RGBA(0x00000028),
     .speaker = RGBA(0x000000ff),
     .empty = RGBA(0x000000ff),
     .camera = RGBA(0x000000ff),
-    .active = RGBA(0xffa028ff),
+    .active = RGBA(0xffaf29ff),
     .transform = RGBA(0xffffffff),
     .vertex = RGBA(0x000000ff),
-    .vertex_select = RGBA(0xff7a00ff),
+    .vertex_select = RGBA(0x00b38aff),
     .vertex_bevel = RGBA(0x00a5ffff),
     .edge = RGBA(0x000000ff),
-    .edge_select = RGBA(0xff7200ff),
+    .edge_select = RGBA(0x00cc9eff),
     .edge_seam = RGBA(0xdb2512ff),
     .edge_sharp = RGBA(0x00ffffff),
     .edge_facesel = RGBA(0x4b4b4bff),
     .edge_crease = RGBA(0xcc0099ff),
     .edge_bevel = RGBA(0x00a5ffff),
     .face = RGBA(0x00000012),
-    .face_select = RGBA(0xff990056),
-    .face_dot = RGBA(0xff8a00ff),
-    .extra_edge_len = RGBA(0x150806ff),
-    .extra_edge_angle = RGBA(0x4d4d00ff),
-    .extra_face_angle = RGBA(0x0000ccff),
-    .extra_face_area = RGBA(0x004d00ff),
+    .face_select = RGBA(0x29cca766),
+    .face_dot = RGBA(0xa1e6d6ff),
+    .extra_edge_len = RGBA(0xff6149ff),
+    .extra_edge_angle = RGBA(0xcccc00ff),
+    .extra_face_angle = RGBA(0xb3b3ffff),
+    .extra_face_area = RGBA(0x00cc00ff),
     .normal = RGBA(0x22ddddff),
     .vertex_normal = RGBA(0x2361ddff),
     .loop_normal = RGBA(0xdd23ddff),
-    .bone_solid = RGBA(0xc8c8c8ff),
+    .bone_solid = RGBA(0xe6e6e6ff),
     .bone_pose = RGBA(0x50c8ff50),
     .bone_pose_active = RGBA(0x8cffff50),
     .cframe = RGBA(0x60c040ff),
     .time_keyframe = RGBA(0xddd700ff),
-    .time_gp_keyframe = RGBA(0xb5e61dff),
-    .freestyle_edge_mark = RGBA(0x7fff7fff),
-    .freestyle_face_mark = RGBA(0x7fff7f4d),
+    .time_gp_keyframe = RGBA(0x00e6b2ff),
+    .freestyle_edge_mark = RGBA(0xffcc7fff),
+    .freestyle_face_mark = RGBA(0xffcc7f4d),
     .nurb_uline = RGBA(0x909000ff),
     .nurb_vline = RGBA(0x803060ff),
-    .act_spline = RGBA(0xdb2512ff),
+    .act_spline = RGBA(0x89e689ff),
     .nurb_sel_uline = RGBA(0xf0ff40ff),
     .nurb_sel_vline = RGBA(0xf090a0ff),
     .lastsel_point = RGBA(0xffffffff),
@@ -364,7 +364,7 @@ const bTheme U_theme_default = {
     .camera_path = RGBA(0x000000ff),
     .gp_vertex_size = 3,
     .gp_vertex = RGBA(0x000000ff),
-    .gp_vertex_select = RGBA(0xff8500ff),
+    .gp_vertex_select = RGBA(0x00cc9eff),
     .skin_root = RGBA(0xb44d4dff),
     .paint_curve_pivot = RGBA(0xff7f7f7f),
     .paint_curve_handle = RGBA(0x7fff7f7f),



More information about the Bf-blender-cvs mailing list