From 97047db16ce6748f30c0e24f0a2053a11286c5fb Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 20 May 2019 14:59:55 +0200 Subject: Revert "Theme: match outliner/properties colors with modes in viewport." While this consistency is useful, green selection in edit mode does not stand out as much as orange. This can cause problems for some users, it seems to depend on the person. Overall the risk of making the change at this point in the release cycle is too high. This reverts commit 5827a47280a0128d0fc47b7c5609058a472bf29f. --- release/datafiles/userdef/userdef_default_theme.c | 30 +++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c index 70b141e5430..ddbfe3a7e48 100644 --- a/release/datafiles/userdef/userdef_default_theme.c +++ b/release/datafiles/userdef/userdef_default_theme.c @@ -305,30 +305,30 @@ const bTheme U_theme_default = { .grid = RGBA(0x6666664d), .wire = RGBA(0x000000ff), .wire_edit = RGBA(0x000000ff), - .select = RGBA(0xcc5d00ff), + .select = RGBA(0xed5700ff), .lamp = RGBA(0x00000028), .speaker = RGBA(0x000000ff), .empty = RGBA(0x000000ff), .camera = RGBA(0x000000ff), - .active = RGBA(0xffaf29ff), + .active = RGBA(0xffa028ff), .transform = RGBA(0xffffffff), .vertex = RGBA(0x000000ff), - .vertex_select = RGBA(0x00e4b0ff), + .vertex_select = RGBA(0xff7a00ff), .vertex_bevel = RGBA(0x00a5ffff), .edge = RGBA(0x000000ff), - .edge_select = RGBA(0x00cc9eff), + .edge_select = RGBA(0xff7200ff), .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(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), + .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), .normal = RGBA(0x22ddddff), .vertex_normal = RGBA(0x2361ddff), .loop_normal = RGBA(0xdd23ddff), @@ -337,12 +337,12 @@ const bTheme U_theme_default = { .bone_pose_active = RGBA(0x8cffff50), .cframe = RGBA(0x60c040ff), .time_keyframe = RGBA(0xddd700ff), - .time_gp_keyframe = RGBA(0x00e6b2ff), - .freestyle_edge_mark = RGBA(0xffcc7fff), - .freestyle_face_mark = RGBA(0xffcc7f4d), + .time_gp_keyframe = RGBA(0xb5e61dff), + .freestyle_edge_mark = RGBA(0x7fff7fff), + .freestyle_face_mark = RGBA(0x7fff7f4d), .nurb_uline = RGBA(0x909000ff), .nurb_vline = RGBA(0x803060ff), - .act_spline = RGBA(0x89e689ff), + .act_spline = RGBA(0xdb2512ff), .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(0x00cc9eff), + .gp_vertex_select = RGBA(0xff8500ff), .skin_root = RGBA(0xb44d4dff), .paint_curve_pivot = RGBA(0xff7f7f7f), .paint_curve_handle = RGBA(0x7fff7f7f), -- cgit v1.2.3