diff options
-rw-r--r-- | release/datafiles/userdef/userdef_default_theme.c | 852 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_blender_version.h | 2 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_300.c | 26 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_userdef.c | 16 | ||||
-rw-r--r-- | source/blender/editors/include/UI_interface.h | 2 | ||||
-rw-r--r-- | source/blender/editors/interface/resources.c | 7 |
6 files changed, 467 insertions, 438 deletions
diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c index d0171867e50..f33ecea0eed 100644 --- a/release/datafiles/userdef/userdef_default_theme.c +++ b/release/datafiles/userdef/userdef_default_theme.c @@ -22,181 +22,163 @@ const bTheme U_theme_default = { .name = "Default", .tui = { .wcol_regular = { - .outline = RGBA(0x373737ff), - .inner = RGBA(0x585858ff), - .inner_sel = RGBA(0x5680c2e6), - .item = RGBA(0x3e3e3eff), + .outline = RGBA(0x3d3d3dff), + .inner = RGBA(0x545454ff), + .inner_sel = RGBA(0x4772b3ff), + .item = RGBA(0xffffff80), .text = RGBA(0xd9d9d9ff), .text_sel = RGBA(0xffffffff), - .shadedown = -5, .roundness = 0.2f, }, .wcol_tool = { - .outline = RGBA(0x373737ff), - .inner = RGBA(0x585858ff), - .inner_sel = RGBA(0x5680c2ff), + .outline = RGBA(0x3d3d3dff), + .inner = RGBA(0x545454ff), + .inner_sel = RGBA(0x4772b3ff), .item = RGBA(0xffffffff), .text = RGBA(0xe6e6e6ff), .text_sel = RGBA(0xffffffff), - .shadedown = -5, .roundness = 0.2f, }, .wcol_toolbar_item = { - .outline = RGBA(0x373737ff), - .inner = RGBA(0x313131ff), - .inner_sel = RGBA(0x5680c2ff), - .item = RGBA(0xe6e6e6cc), + .outline = RGBA(0x3d3d3dff), + .inner = RGBA(0x282828ff), + .inner_sel = RGBA(0x4772b3ff), + .item = RGBA(0xffffff80), .text = RGBA(0xe6e6e6ff), .text_sel = RGBA(0xffffffff), .roundness = 0.2f, }, .wcol_text = { - .outline = RGBA(0x444444ff), - .inner = RGBA(0x1f1f1fff), - .inner_sel = RGBA(0x505050ff), - .item = RGBA(0x191919ff), + .outline = RGBA(0x3d3d3dff), + .inner = RGBA(0x1d1d1dff), + .inner_sel = RGBA(0x181818ff), + .item = RGBA(0x4772b3ff), .text = RGBA(0xe6e6e6ff), .text_sel = RGBA(0xffffffff), - .shaded = 1, - .shadetop = -3, .roundness = 0.2f, }, .wcol_radio = { - .outline = RGBA(0x373737ff), - .inner = RGBA(0x595959ff), - .inner_sel = RGBA(0x5680c2e6), - .item = RGBA(0xffffffff), + .outline = RGBA(0x3d3d3dff), + .inner = RGBA(0x282828ff), + .inner_sel = RGBA(0x4772b3ff), + .item = RGBA(0x252525ff), .text = RGBA(0xe6e6e6ff), .text_sel = RGBA(0xffffffff), - .shadetop = 5, - .shadedown = -5, .roundness = 0.2f, }, .wcol_option = { - .outline = RGBA(0x373737ff), - .inner = RGBA(0x666666ff), - .inner_sel = RGBA(0x5680c2e6), - .item = RGBA(0xffffffff), + .outline = RGBA(0x3d3d3dff), + .inner = RGBA(0x282828ff), + .inner_sel = RGBA(0x71aaffff), + .item = RGBA(0x111111ff), .text = RGBA(0xe6e6e6ff), .text_sel = RGBA(0xffffffff), - .shadedown = -15, .roundness = 0.2f, }, .wcol_toggle = { - .outline = RGBA(0x373737ff), - .inner = RGBA(0x595959ff), - .inner_sel = RGBA(0x5680c2e6), - .item = RGBA(0x191919ff), + .outline = RGBA(0x3d3d3dff), + .inner = RGBA(0x282828ff), + .inner_sel = RGBA(0x4772b3ff), + .item = RGBA(0x252525ff), .text = RGBA(0xe6e6e6ff), .text_sel = RGBA(0xffffffff), .roundness = 0.2f, }, .wcol_num = { - .outline = RGBA(0x444444ff), - .inner = RGBA(0x595959ff), - .inner_sel = RGBA(0x505050ff), - .item = RGBA(0x191919ff), + .outline = RGBA(0x3d3d3dff), + .inner = RGBA(0x545454ff), + .inner_sel = RGBA(0x222222ff), + .item = RGBA(0x4772b3ff), .text = RGBA(0xe6e6e6ff), .text_sel = RGBA(0xffffffff), .roundness = 0.2f, }, .wcol_numslider = { - .outline = RGBA(0x444444ff), - .inner = RGBA(0x595959ff), - .inner_sel = RGBA(0x505050ff), - .item = RGBA(0x5680c2e6), + .outline = RGBA(0x3d3d3dff), + .inner = RGBA(0x545454ff), + .inner_sel = RGBA(0x222222ff), + .item = RGBA(0x4772b3ff), .text = RGBA(0xe6e6e6ff), .text_sel = RGBA(0xffffffff), - .shaded = 1, - .shadetop = -4, .roundness = 0.2f, }, .wcol_tab = { - .outline = RGBA(0x202020ff), - .inner = RGBA(0x2b2b2bff), - .inner_sel = RGBA(0x424242ff), - .item = RGBA(0x2d2d2dff), + .outline = RGBA(0x1d1d1dff), + .inner = RGBA(0x1d1d1dff), + .inner_sel = RGBA(0x303030ff), + .item = RGBA(0x1d1d1dff), .text = RGBA(0x989898ff), .text_sel = RGBA(0xffffffff), .roundness = 0.2f, }, .wcol_menu = { - .outline = RGBA(0x444444ff), - .inner = RGBA(0x2c2c2cff), - .inner_sel = RGBA(0x696e76ff), + .outline = RGBA(0x3d3d3dff), + .inner = RGBA(0x282828ff), + .inner_sel = RGBA(0x4772b3b3), .item = RGBA(0xd9d9d9ff), - .text = RGBA(0xd9d9d9ff), + .text = RGBA(0xe6e6e6ff), .text_sel = RGBA(0xffffffff), - .shadetop = 10, - .shadedown = -10, .roundness = 0.2f, }, .wcol_pulldown = { - .outline = RGBA(0x4d4d4dff), - .inner = RGBA(0x2e2e2ecc), - .inner_sel = RGBA(0x5680c2e6), + .outline = RGBA(0x3d3d3dff), + .inner = RGBA(0x22222266), + .inner_sel = RGBA(0x4772b3b3), .item = RGBA(0x727272ff), .text = RGBA(0xd9d9d9ff), .text_sel = RGBA(0xffffffff), - .shadetop = 25, - .shadedown = -20, .roundness = 0.2f, }, .wcol_menu_back = { - .outline = RGBA(0x19191aff), - .inner = RGBA(0x1f1f1fef), - .inner_sel = RGBA(0x585858ff), - .item = RGBA(0x727272ff), - .text = RGBA(0xa5a5a5ff), + .outline = RGBA(0x242424ff), + .inner = RGBA(0x181818ff), + .inner_sel = RGBA(0x4772b3ff), + .item = RGBA(0xd9d9d9ff), + .text = RGBA(0x999999ff), .text_sel = RGBA(0xffffffff), - .shadetop = 25, - .shadedown = -20, .roundness = 0.2f, }, .wcol_menu_item = { - .inner_sel = RGBA(0x5680c2e6), + .outline = RGBA(0x3d3d3d00), + .inner = RGBA(0x18181800), + .inner_sel = RGBA(0x4772b3ff), .item = RGBA(0xffffff8f), - .text = RGBA(0xe6e6e6ff), + .text = RGBA(0xddddddff), .text_sel = RGBA(0xffffffff), - .shadetop = 38, .roundness = 0.2f, }, .wcol_tooltip = { .outline = RGBA(0x19191aff), - .inner = RGBA(0x19191aef), - .inner_sel = RGBA(0x19191aef), - .item = RGBA(0x19191aef), - .text = RGBA(0xe6e6e6ff), + .inner = RGBA(0x181818ff), + .inner_sel = RGBA(0x181818ff), + .item = RGBA(0x181818ff), + .text = RGBA(0xccccccff), .text_sel = RGBA(0xffffffff), - .shadetop = 25, - .shadedown = -20, .roundness = 0.2f, }, .wcol_box = { - .outline = RGBA(0x444444ff), - .inner = RGBA(0x00000033), - .inner_sel = RGBA(0x696e76ff), + .outline = RGBA(0x3d3d3dff), + .inner = RGBA(0x1d1d1d80), + .inner_sel = RGBA(0x545454ff), .item = RGBA(0x191919ff), .text = RGBA(0xe6e6e6ff), .text_sel = RGBA(0xffffffff), .roundness = 0.2f, }, .wcol_scroll = { - .outline = RGBA(0x424242ff), - .inner = RGBA(0x67676700), - .inner_sel = RGBA(0xb3b3b3ff), - .item = RGBA(0x676767ff), + .outline = RGBA(0x3d3d3dff), + .inner = RGBA(0x22222200), + .inner_sel = RGBA(0xffffffff), + .item = RGBA(0x545454ff), .text = RGBA(0xe6e6e6ff), .text_sel = RGBA(0xffffffff), - .shadetop = 5, - .shadedown = -5, .roundness = 0.5f, }, .wcol_progress = { - .outline = RGBA(0x585858ff), - .inner = RGBA(0x2c2c2cff), - .inner_sel = RGBA(0x5680c2ff), - .item = RGBA(0x5680c2ff), + .outline = RGBA(0x3d3d3dff), + .inner = RGBA(0x222222ff), + .inner_sel = RGBA(0x4772b3ff), + .item = RGBA(0x4772b3ff), .text = RGBA(0xe6e6e6ff), .text_sel = RGBA(0xffffffff), .roundness = 0.2f, @@ -204,21 +186,19 @@ const bTheme U_theme_default = { .wcol_list_item = { .outline = RGBA(0x2d2d2dff), .inner = RGBA(0x2d2d2d00), - .inner_sel = RGBA(0x696e76ff), + .inner_sel = RGBA(0x484a4fff), .item = RGBA(0xb3b3b3ff), - .text = RGBA(0xe6e6e6ff), + .text = RGBA(0xccccccff), .text_sel = RGBA(0xffffffff), .roundness = 0.2f, }, .wcol_pie_menu = { - .outline = RGBA(0x333333ff), - .inner = RGBA(0x212121ef), - .inner_sel = RGBA(0x5680c2e6), - .item = RGBA(0x585858ff), + .outline = RGBA(0x3d3d3dff), + .inner = RGBA(0x181818ff), + .inner_sel = RGBA(0x5680c2ff), + .item = RGBA(0x4772b3ff), .text = RGBA(0xd9d9d9ff), .text_sel = RGBA(0xffffffff), - .shadetop = 10, - .shadedown = -10, .roundness = 0.2f, }, .wcol_state = { @@ -235,15 +215,15 @@ const bTheme U_theme_default = { .blend = 0.5f, }, .widget_emboss = RGBA(0x00000026), - .menu_shadow_fac = 0.3f, - .menu_shadow_width = 4, - .editor_outline = RGBA(0x1f1f1fff), + .menu_shadow_fac = 0.4f, + .menu_shadow_width = 2, + .editor_outline = RGBA(0x161616ff), .transparent_checker_primary = RGBA(0x333333ff), .transparent_checker_secondary = RGBA(0x262626ff), .transparent_checker_size = 8, .icon_alpha = 1.0f, .icon_saturation = 0.5f, - .widget_text_cursor = RGBA(0x3399e6ff), + .widget_text_cursor = RGBA(0x71a8ffff), .xaxis = RGBA(0xff3352ff), .yaxis = RGBA(0x8bdc00ff), .zaxis = RGBA(0x2890ffff), @@ -253,65 +233,70 @@ const bTheme U_theme_default = { .gizmo_view_align = RGBA(0xffffffff), .gizmo_a = RGBA(0x4da84dff), .gizmo_b = RGBA(0xa33535ff), - .icon_scene = RGBA(0xe6e6e6ff), - .icon_collection = RGBA(0xf4f4f4ff), - .icon_object = RGBA(0xee9e5dff), + .icon_scene = RGBA(0xccccccff), + .icon_collection = RGBA(0xffffffff), + .icon_object = RGBA(0xe19658ff), .icon_object_data = RGBA(0x00d4a3ff), - .icon_modifier = RGBA(0x84b8ffff), - .icon_shading = RGBA(0xea7581ff), - .icon_folder = RGBA(0xe3c16eff), + .icon_modifier = RGBA(0x74a2ffff), + .icon_shading = RGBA(0xcc6670ff), + .icon_folder = RGBA(0xccad63ff), .panel_roundness = 0.4f, }, .space_properties = { - .back = RGBA(0x42424200), - .title = RGBA(0xd4d4d4ff), + .back = RGBA(0x30303000), + .title = RGBA(0xe6e6e6ff), .text = RGBA(0xe6e6e6ff), .text_hi = RGBA(0xffffffff), - .header = RGBA(0x424242ff), + .header = RGBA(0x303030b3), .header_text = RGBA(0xeeeeeeff), .header_text_hi = RGBA(0xffffffff), - .tab_active = RGBA(0x4b4b4bff), - .tab_inactive = RGBA(0x2b2b2bff), - .tab_back = RGBA(0x232323ff), - .tab_outline = RGBA(0x232323ff), - .button = RGBA(0x424242ff), - .button_title = RGBA(0xffffffff), - .button_text = RGBA(0xe5e5e5ff), + .tab_active = RGBA(0x303030ff), + .tab_inactive = RGBA(0x1d1d1dff), + .tab_back = RGBA(0x181818ff), + .tab_outline = RGBA(0x3d3d3dff), + .button = RGBA(0x30303000), + .button_title = RGBA(0xccccccff), + .button_text = RGBA(0xccccccff), .button_text_hi = RGBA(0xffffffff), - .navigation_bar = RGBA(0x232323ff), + .navigation_bar = RGBA(0x1d1d1dff), + .execution_buts = RGBA(0x1d1d1dff), .panelcolors = { - .header = RGBA(0x424242ff), - .back = RGBA(0x383838ff), - .sub_back = RGBA(0x00000024), + .header = RGBA(0x3d3d3dff), + .back = RGBA(0x3d3d3dff), + .sub_back = RGBA(0x0000001f), }, + .active = RGBA(0x4772b3ff), .vertex_size = 3, .outline_width = 1, .facedot_size = 4, - .match = RGBA(0x5680c2ff), - .active = RGBA(0x5680c2ff), + .match = RGBA(0x4772b3ff), }, .space_view3d = { - .back = RGBA(0x393939ff), + .back = RGBA(0x3d3d3dff), + .back_grad = RGBA(0x30303000), + .background_type = 2, .title = RGBA(0xeeeeeeff), .text = RGBA(0xe6e6e6ff), .text_hi = RGBA(0xffffffff), - .header = RGBA(0x42424200), + .header = RGBA(0x303030b3), .header_text = RGBA(0xeeeeeeff), .header_text_hi = RGBA(0xffffffff), - .tab_active = RGBA(0x4b4b4bff), - .tab_inactive = RGBA(0x2b2b2bff), - .tab_back = RGBA(0x232323ff), - .tab_outline = RGBA(0x232323ff), - .button = RGBA(0x35353500), + .tab_active = RGBA(0x303030ff), + .tab_inactive = RGBA(0x1d1d1dff), + .tab_back = RGBA(0x181818ff), + .tab_outline = RGBA(0x3d3d3dff), + .button = RGBA(0x30303000), .button_title = RGBA(0xffffffff), - .button_text = RGBA(0xe5e5e5ff), + .button_text = RGBA(0xccccccff), .button_text_hi = RGBA(0xffffffff), + .navigation_bar = RGBA(0x1d1d1dff), + .execution_buts = RGBA(0x303030ff), .panelcolors = { - .header = RGBA(0x424242e6), - .back = RGBA(0x333333f0), - .sub_back = RGBA(0x0000003e), + .header = RGBA(0x3d3d3dff), + .back = RGBA(0x3d3d3dff), + .sub_back = RGBA(0x0000001f), }, - .grid = RGBA(0x6666664d), + .grid = RGBA(0x54545480), .wire = RGBA(0x000000ff), .wire_edit = RGBA(0x000000ff), .select = RGBA(0xed5700ff), @@ -347,7 +332,7 @@ const bTheme U_theme_default = { .bone_pose = RGBA(0x50c8ff50), .bone_pose_active = RGBA(0x8cffff50), .bone_locked_weight = RGBA(0xff000080), - .cframe = RGBA(0x60c040ff), + .cframe = RGBA(0x4772b3ff), .time_keyframe = RGBA(0xddd700ff), .time_gp_keyframe = RGBA(0xb5e61dff), .freestyle_edge_mark = RGBA(0x7fff7fff), @@ -371,7 +356,7 @@ const bTheme U_theme_default = { .obcenter_dia = 6, .facedot_size = 3, .editmesh_active = RGBA(0xffffff33), - .clipping_border_3d = RGBA(0x313131ff), + .clipping_border_3d = RGBA(0x3f3f3fff), .bundle_solid = RGBA(0xc8c8c8ff), .camera_path = RGBA(0x000000ff), .gp_vertex_size = 3, @@ -386,66 +371,69 @@ const bTheme U_theme_default = { .title = RGBA(0xffffffff), .text = RGBA(0xe6e6e6ff), .text_hi = RGBA(0xffffffff), - .header = RGBA(0x2e2e2eff), + .header = RGBA(0x303030b3), .header_text = RGBA(0xeeeeeeff), .header_text_hi = RGBA(0xffffffff), - .tab_active = RGBA(0x4b4b4bff), - .tab_inactive = RGBA(0x2b2b2bff), - .tab_back = RGBA(0x232323ff), - .tab_outline = RGBA(0x232323ff), - .button = RGBA(0x4b4b4bff), + .tab_active = RGBA(0x303030ff), + .tab_inactive = RGBA(0x1d1d1dff), + .tab_back = RGBA(0x181818ff), + .tab_outline = RGBA(0x3d3d3dff), + .button = RGBA(0x30303000), .button_title = RGBA(0xffffffff), - .button_text = RGBA(0xe5e5e5ff), + .button_text = RGBA(0xccccccff), .button_text_hi = RGBA(0xffffffff), - .execution_buts = RGBA(0x444444ff), + .navigation_bar = RGBA(0x303030ff), + .execution_buts = RGBA(0x303030ff), .panelcolors = { - .header = RGBA(0x4b4b4bff), - .back = RGBA(0x404040ff), - .sub_back = RGBA(0x0000003e), + .header = RGBA(0x3d3d3dff), + .back = RGBA(0x3d3d3dff), + .sub_back = RGBA(0x0000001f), }, - .hilite = RGBA(0x4f76b3ff), + .hilite = RGBA(0x4772b3ff), .vertex_size = 3, .outline_width = 1, .facedot_size = 4, - .row_alternate = RGBA(0xffffff07), + .row_alternate = RGBA(0xffffff04), }, .space_graph = { - .back = RGBA(0x42424200), + .back = RGBA(0x30303000), .title = RGBA(0xffffffff), .text = RGBA(0xa6a6a6ff), .text_hi = RGBA(0xffffffff), - .header = RGBA(0x2e2e2eff), + .header = RGBA(0x303030b3), .header_text = RGBA(0xeeeeeeff), .header_text_hi = RGBA(0xffffffff), - .tab_active = RGBA(0x4b4b4bff), - .tab_inactive = RGBA(0x2b2b2bff), - .tab_back = RGBA(0x232323ff), - .tab_outline = RGBA(0x232323ff), - .button = RGBA(0x424242ff), + .tab_active = RGBA(0x303030ff), + .tab_inactive = RGBA(0x1d1d1dff), + .tab_back = RGBA(0x181818ff), + .tab_outline = RGBA(0x3d3d3dff), + .button = RGBA(0x30303000), .button_title = RGBA(0xffffffff), - .button_text = RGBA(0xe5e5e5ff), + .button_text = RGBA(0xccccccff), .button_text_hi = RGBA(0xffffffff), - .list = RGBA(0x282828ff), + .list = RGBA(0x1d1d1dff), .list_title = RGBA(0xffffffff), .list_text = RGBA(0xb8b8b8ff), - .list_text_hi = RGBA(0xffaf29ff), + .list_text_hi = RGBA(0xffffffff), + .navigation_bar = RGBA(0x1d1d1dff), + .execution_buts = RGBA(0x303030ff), .panelcolors = { - .header = RGBA(0x424242cc), - .back = RGBA(0x333333b3), - .sub_back = RGBA(0x0000003e), + .header = RGBA(0x3d3d3dff), + .back = RGBA(0x3d3d3dff), + .sub_back = RGBA(0x0000001f), }, .shade1 = RGBA(0x96969600), - .shade2 = RGBA(0x33333364), - .grid = RGBA(0x2a2a2aff), - .group = RGBA(0x16330fff), - .group_active = RGBA(0x368024ff), + .shade2 = RGBA(0x12121264), + .grid = RGBA(0x1a1a1aff), + .group = RGBA(0x1a332dff), + .group_active = RGBA(0x216d5bff), .vertex = RGBA(0x000000ff), .vertex_select = RGBA(0xff8500ff), .vertex_active = RGBA(0xffffffff), - .cframe = RGBA(0x5680c2ff), - .time_scrub_background = RGBA(0x292929e6), - .time_marker_line = RGBA(0x00000060), - .time_marker_line_selected = RGBA(0xffffff60), + .cframe = RGBA(0x4772b3ff), + .time_scrub_background = RGBA(0x161616ff), + .time_marker_line = RGBA(0xffffff4d), + .time_marker_line_selected = RGBA(0xffffffb3), .lastsel_point = RGBA(0xffffffff), .handle_auto = RGBA(0x909000ff), .handle_vect = RGBA(0x409030ff), @@ -455,8 +443,8 @@ const bTheme U_theme_default = { .handle_sel_vect = RGBA(0x40c030ff), .handle_sel_align = RGBA(0xf090a0ff), .handle_sel_auto_clamped = RGBA(0xf0af90ff), - .ds_channel = RGBA(0x0f2c4dff), - .ds_subchannel = RGBA(0x143e66ff), + .ds_channel = RGBA(0x194e80ff), + .ds_subchannel = RGBA(0x0f2c4dff), .vertex_size = 6, .outline_width = 1, .facedot_size = 4, @@ -465,25 +453,27 @@ const bTheme U_theme_default = { .anim_preview_range = RGBA(0xa14d0066), }, .space_info = { - .back = RGBA(0x28282800), + .back = RGBA(0x1d1d1d00), .title = RGBA(0xffffffff), .text = RGBA(0xc3c3c3ff), .text_hi = RGBA(0xffffffff), - .header = RGBA(0x454545ff), + .header = RGBA(0x303030b3), .header_text = RGBA(0xeeeeeeff), .header_text_hi = RGBA(0xffffffff), - .tab_active = RGBA(0x4b4b4bff), - .tab_inactive = RGBA(0x2b2b2bff), - .tab_back = RGBA(0x232323ff), - .tab_outline = RGBA(0x232323ff), - .button = RGBA(0x424242ff), + .tab_active = RGBA(0x303030ff), + .tab_inactive = RGBA(0x1d1d1dff), + .tab_back = RGBA(0x181818ff), + .tab_outline = RGBA(0x3d3d3dff), + .button = RGBA(0x30303000), .button_title = RGBA(0xffffffff), - .button_text = RGBA(0xe5e5e5ff), + .button_text = RGBA(0xccccccff), .button_text_hi = RGBA(0xffffffff), + .navigation_bar = RGBA(0x1d1d1dff), + .execution_buts = RGBA(0x303030ff), .panelcolors = { - .header = RGBA(0x424242cc), - .back = RGBA(0x333333b3), - .sub_back = RGBA(0x0000003e), + .header = RGBA(0x3d3d3dff), + .back = RGBA(0x3d3d3dff), + .sub_back = RGBA(0x0000001f), }, .vertex_size = 3, .outline_width = 1, @@ -498,56 +488,58 @@ const bTheme U_theme_default = { .info_info_text = RGBA(0xffffffff), .info_debug = RGBA(0x6b3293ff), .info_debug_text = RGBA(0xffffffff), - .info_property = RGBA(0x329364ff), + .info_property = RGBA(0x236666ff), .info_property_text = RGBA(0xffffffff), - .info_operator = RGBA(0x329364ff), + .info_operator = RGBA(0x235266ff), .info_operator_text = RGBA(0xffffffff), }, .space_action = { - .back = RGBA(0x42424200), + .back = RGBA(0x30303000), .title = RGBA(0xeeeeeeff), .text = RGBA(0xa6a6a6ff), - .text_hi = RGBA(0xffffffff), - .header = RGBA(0x424242ff), + .text_hi = RGBA(0x143e66ff), + .header = RGBA(0x303030b3), .header_text = RGBA(0xeeeeeeff), .header_text_hi = RGBA(0xffffffff), - .tab_active = RGBA(0x4b4b4bff), - .tab_inactive = RGBA(0x2b2b2bff), - .tab_back = RGBA(0x232323ff), - .tab_outline = RGBA(0x232323ff), - .button = RGBA(0x282828ff), + .tab_active = RGBA(0x303030ff), + .tab_inactive = RGBA(0x1d1d1dff), + .tab_back = RGBA(0x181818ff), + .tab_outline = RGBA(0x3d3d3dff), + .button = RGBA(0x22222200), .button_title = RGBA(0xffffffff), - .button_text = RGBA(0xe5e5e5ff), + .button_text = RGBA(0xccccccff), .button_text_hi = RGBA(0xffffffff), - .list = RGBA(0x282828ff), + .list = RGBA(0x1d1d1dff), .list_title = RGBA(0xffffffff), .list_text = RGBA(0xb8b8b8ff), - .list_text_hi = RGBA(0xffaf29ff), + .list_text_hi = RGBA(0xffffffff), + .navigation_bar = RGBA(0x1d1d1dff), + .execution_buts = RGBA(0x303030ff), .panelcolors = { - .header = RGBA(0x424242cc), - .back = RGBA(0x333333b3), - .sub_back = RGBA(0x0000003e), + .header = RGBA(0x3d3d3dff), + .back = RGBA(0x3d3d3dff), + .sub_back = RGBA(0x0000001f), }, .shade1 = RGBA(0xc0c0c000), - .shade2 = RGBA(0x333333ff), + .shade2 = RGBA(0x1d1d1d99), .hilite = RGBA(0x60c04044), - .grid = RGBA(0x2a2a2aff), - .group = RGBA(0x16330f37), - .group_active = RGBA(0x36802455), - .strip = RGBA(0x1a151580), - .strip_select = RGBA(0xff8c00cc), - .cframe = RGBA(0x5680c2ff), - .time_scrub_background = RGBA(0x292929e6), - .time_marker_line = RGBA(0x00000060), - .time_marker_line_selected = RGBA(0xffffff60), - .ds_channel = RGBA(0x0f2c4d24), - .ds_subchannel = RGBA(0x143e6624), + .grid = RGBA(0x161616ff), + .group = RGBA(0x1a332d37), + .group_active = RGBA(0x216d5b67), + .strip = RGBA(0xffffff1f), + .strip_select = RGBA(0xff8c0099), + .cframe = RGBA(0x4772b3ff), + .time_scrub_background = RGBA(0x1d1d1dff), + .time_marker_line = RGBA(0xffffff4d), + .time_marker_line_selected = RGBA(0xffffffb3), + .ds_channel = RGBA(0x194e8080), + .ds_subchannel = RGBA(0x0f2c4d80), .ds_ipoline = RGBA(0x94e575cc), - .keytype_keyframe = RGBA(0xe8e8e8ff), + .keytype_keyframe = RGBA(0xbfbfbfff), .keytype_extreme = RGBA(0xe8b3ccff), .keytype_breakdown = RGBA(0xb3dbe8ff), .keytype_jitter = RGBA(0x94e575ff), - .keytype_movehold = RGBA(0x5c5656ff), + .keytype_movehold = RGBA(0x808080ff), .keytype_keyframe_select = RGBA(0xffbe33ff), .keytype_extreme_select = RGBA(0xf28080ff), .keytype_breakdown_select = RGBA(0x54bfedff), @@ -560,43 +552,45 @@ const bTheme U_theme_default = { .facedot_size = 4, .keyframe_scale_fac = 1.0f, .handle_vertex_size = 4, - .anim_active = RGBA(0x4d250066), + .anim_active = RGBA(0x4d272766), .anim_preview_range = RGBA(0xa14d0066), }, .space_nla = { - .back = RGBA(0x42424200), + .back = RGBA(0x30303000), .title = RGBA(0xffffffff), .text = RGBA(0xa6a6a6ff), .text_hi = RGBA(0xffffffff), - .header = RGBA(0x424242ff), + .header = RGBA(0x303030b3), .header_text = RGBA(0xeeeeeeff), .header_text_hi = RGBA(0xffffffff), - .tab_active = RGBA(0x4b4b4bff), - .tab_inactive = RGBA(0x2b2b2bff), - .tab_back = RGBA(0x232323ff), - .tab_outline = RGBA(0x232323ff), - .button = RGBA(0x424242ff), + .tab_active = RGBA(0x303030ff), + .tab_inactive = RGBA(0x1d1d1dff), + .tab_back = RGBA(0x181818ff), + .tab_outline = RGBA(0x3d3d3dff), + .button = RGBA(0x30303000), .button_title = RGBA(0xffffffff), - .button_text = RGBA(0xe5e5e5ff), + .button_text = RGBA(0xccccccff), .button_text_hi = RGBA(0xffffffff), - .list = RGBA(0x282828ff), + .list = RGBA(0x1d1d1dff), .list_title = RGBA(0xffffffff), - .list_text = RGBA(0xb8b8b8ff), - .list_text_hi = RGBA(0xffaf29ff), + .list_text = RGBA(0xe5e5e5ff), + .list_text_hi = RGBA(0xffffffff), + .navigation_bar = RGBA(0x1d1d1dff), + .execution_buts = RGBA(0x303030ff), .panelcolors = { - .header = RGBA(0x424242cc), - .back = RGBA(0x333333b3), - .sub_back = RGBA(0x0000003e), + .header = RGBA(0x3d3d3dff), + .back = RGBA(0x3d3d3dff), + .sub_back = RGBA(0x0000001f), }, .shade1 = RGBA(0x96969600), .grid = RGBA(0x2a2a2aff), - .strip = RGBA(0x0c0a0a80), + .strip = RGBA(0x0d0d0d80), .strip_select = RGBA(0xff8c00ff), - .cframe = RGBA(0x5680c2ff), - .time_scrub_background = RGBA(0x292929e6), - .time_marker_line = RGBA(0x00000060), - .time_marker_line_selected = RGBA(0xffffff60), - .ds_channel = RGBA(0x5a85b2ff), + .cframe = RGBA(0x4772b3ff), + .time_scrub_background = RGBA(0x161616ff), + .time_marker_line = RGBA(0xffffff4d), + .time_marker_line_selected = RGBA(0xffffffb3), + .ds_channel = RGBA(0x0f2c4dff), .ds_subchannel = RGBA(0x7d98b3ff), .keyborder = RGBA(0x000000ff), .keyborder_select = RGBA(0x000000ff), @@ -604,12 +598,12 @@ const bTheme U_theme_default = { .outline_width = 1, .facedot_size = 4, .handle_vertex_size = 4, - .anim_active = RGBA(0xcc701a66), - .anim_non_active = RGBA(0x9987614d), + .anim_active = RGBA(0x99541366), + .anim_non_active = RGBA(0x4d3b174d), .anim_preview_range = RGBA(0xa14d0066), .nla_tweaking = RGBA(0x4df31a4d), .nla_tweakdupli = RGBA(0xd90000ff), - .nla_track = RGBA(0x424242ff), + .nla_track = RGBA(0x303030ff), .nla_transition = RGBA(0x1c2630ff), .nla_transition_sel = RGBA(0x2e75dbff), .nla_meta = RGBA(0x332642ff), @@ -618,34 +612,36 @@ const bTheme U_theme_default = { .nla_sound_sel = RGBA(0x1f7a7aff), }, .space_sequencer = { - .back = RGBA(0x42424200), + .back = RGBA(0x30303000), .title = RGBA(0xeeeeeeff), .text = RGBA(0xa6a6a6ff), .text_hi = RGBA(0xffffffff), - .header = RGBA(0x424242ff), + .header = RGBA(0x303030b3), .header_text = RGBA(0xeeeeeeff), .header_text_hi = RGBA(0xffffffff), - .tab_active = RGBA(0x4b4b4bff), - .tab_inactive = RGBA(0x2b2b2bff), - .tab_back = RGBA(0x232323ff), - .tab_outline = RGBA(0x232323ff), - .button = RGBA(0x424242ff), + .tab_active = RGBA(0x303030ff), + .tab_inactive = RGBA(0x1d1d1dff), + .tab_back = RGBA(0x181818ff), + .tab_outline = RGBA(0x3d3d3dff), + .button = RGBA(0x30303000), .button_title = RGBA(0xffffffff), - .button_text = RGBA(0xe5e5e5ff), + .button_text = RGBA(0xccccccff), .button_text_hi = RGBA(0xffffffff), + .navigation_bar = RGBA(0x1d1d1dff), + .execution_buts = RGBA(0x303030ff), .panelcolors = { - .header = RGBA(0x424242cc), - .back = RGBA(0x333333b3), - .sub_back = RGBA(0x0000003e), + .header = RGBA(0x3d3d3dff), + .back = RGBA(0x3d3d3dff), + .sub_back = RGBA(0x0000001f), }, .shade1 = RGBA(0xa0a0a000), - .grid = RGBA(0x212121ff), + .grid = RGBA(0x181818ff), .vertex_select = RGBA(0xff8500ff), .bone_pose = RGBA(0x50c8ff50), - .cframe = RGBA(0x5680c2ff), - .time_scrub_background = RGBA(0x292929e6), - .time_marker_line = RGBA(0x00000060), - .time_marker_line_selected = RGBA(0xffffff60), + .cframe = RGBA(0x4772b3ff), + .time_scrub_background = RGBA(0x121212ff), + .time_marker_line = RGBA(0xffffff4d), + .time_marker_line_selected = RGBA(0xffffffb3), .vertex_size = 3, .outline_width = 1, .facedot_size = 4, @@ -653,8 +649,8 @@ const bTheme U_theme_default = { .movieclip = RGBA(0x8f4c4cff), .mask = RGBA(0x666666ff), .image = RGBA(0x8f744bff), - .scene = RGBA(0x828f50ff), - .audio = RGBA(0x4c8f8fff), + .scene = RGBA(0x808033ff), + .audio = RGBA(0x448080ff), .effect = RGBA(0x514a73ff), .transition = RGBA(0x8f4571ff), .meta = RGBA(0x5b4d91ff), @@ -664,39 +660,41 @@ const bTheme U_theme_default = { .selected_strip = RGBA(0xff8f0dff), .gp_vertex_size = 3, .gp_vertex_select = RGBA(0xff8500ff), + .row_alternate = RGBA(0xffffff05), .anim_preview_range = RGBA(0xa14d0066), .metadatatext = RGBA(0xffffffff), - .row_alternate = RGBA(0xffffff0d), }, .space_image = { - .back = RGBA(0x44444400), + .back = RGBA(0x30303000), .title = RGBA(0xeeeeeeff), .text = RGBA(0xe6e6e6ff), .text_hi = RGBA(0xffffffff), - .header = RGBA(0x424242ff), + .header = RGBA(0x303030b3), .header_text = RGBA(0xeeeeeeff), .header_text_hi = RGBA(0xffffffff), - .tab_active = RGBA(0x4b4b4bff), - .tab_inactive = RGBA(0x2b2b2bff), - .tab_back = RGBA(0x232323ff), - .tab_outline = RGBA(0x232323ff), - .button = RGBA(0x35353500), + .tab_active = RGBA(0x303030ff), + .tab_inactive = RGBA(0x1d1d1dff), + .tab_back = RGBA(0x181818ff), + .tab_outline = RGBA(0x3d3d3dff), + .button = RGBA(0x30303000), .button_title = RGBA(0xffffffff), - .button_text = RGBA(0xe5e5e5ff), + .button_text = RGBA(0xccccccff), .button_text_hi = RGBA(0xffffffff), + .navigation_bar = RGBA(0x1d1d1dff), + .execution_buts = RGBA(0x303030ff), .panelcolors = { - .header = RGBA(0x424242cc), - .back = RGBA(0x333333b3), - .sub_back = RGBA(0x0000003e), + .header = RGBA(0x3d3d3dff), + .back = RGBA(0x3d3d3dff), + .sub_back = RGBA(0x0000001f), }, - .grid = RGBA(0x505050ff), + .grid = RGBA(0x303030ff), .wire_edit = RGBA(0xc0c0c0ff), .vertex_select = RGBA(0xff8500ff), .edge_select = RGBA(0xff8500ff), .face = RGBA(0xffffff0a), .face_select = RGBA(0xff85003c), .face_dot = RGBA(0xff8500ff), - .cframe = RGBA(0x60c040ff), + .cframe = RGBA(0x4772b3ff), .freestyle_face_mark = RGBA(0x7fff7f33), .handle_auto = RGBA(0x909000ff), .handle_align = RGBA(0x803060ff), @@ -723,182 +721,190 @@ const bTheme U_theme_default = { .metadatatext = RGBA(0xffffffff), }, .space_text = { - .back = RGBA(0x30303000), + .back = RGBA(0x23232300), .title = RGBA(0xeeeeeeff), .text = RGBA(0xe6e6e6ff), .text_hi = RGBA(0xffffffff), - .header = RGBA(0x42424200), + .header = RGBA(0x303030b3), .header_text = RGBA(0xeeeeeeff), .header_text_hi = RGBA(0xffffffff), - .tab_active = RGBA(0x4b4b4bff), - .tab_inactive = RGBA(0x2b2b2bff), - .tab_back = RGBA(0x232323ff), - .tab_outline = RGBA(0x232323ff), - .button = RGBA(0x424242ff), + .tab_active = RGBA(0x303030ff), + .tab_inactive = RGBA(0x1d1d1dff), + .tab_back = RGBA(0x181818ff), + .tab_outline = RGBA(0x3d3d3dff), + .button = RGBA(0x30303000), .button_title = RGBA(0xffffffff), - .button_text = RGBA(0xe5e5e5ff), + .button_text = RGBA(0xccccccff), .button_text_hi = RGBA(0xffffffff), + .navigation_bar = RGBA(0x1d1d1dff), + .execution_buts = RGBA(0x303030ff), .panelcolors = { - .header = RGBA(0x42424200), - .back = RGBA(0x333333b3), - .sub_back = RGBA(0x0000003e), + .header = RGBA(0x3d3d3dff), + .back = RGBA(0x3d3d3dff), + .sub_back = RGBA(0x0000001f), }, - .shade2 = RGBA(0x5680c2e6), + .shade2 = RGBA(0x2d4366e6), .hilite = RGBA(0xff0000ff), - .grid = RGBA(0x202020ff), + .grid = RGBA(0x1d1d1dff), .vertex_size = 3, .outline_width = 1, .facedot_size = 4, - .syntaxl = RGBA(0xf6e162ff), + .syntaxl = RGBA(0xe6d573ff), .syntaxs = RGBA(0xff734dff), - .syntaxb = RGBA(0xff1961ff), - .syntaxn = RGBA(0x50dbffff), - .syntaxv = RGBA(0x95d600ff), + .syntaxb = RGBA(0xe62e67ff), + .syntaxn = RGBA(0x48c5e6ff), + .syntaxv = RGBA(0x689d06ff), .syntaxc = RGBA(0x939393ff), - .syntaxd = RGBA(0xad80ffff), + .syntaxd = RGBA(0x9c73e6ff), .syntaxr = RGBA(0xc4753bff), - .line_numbers = RGBA(0xd0d0d0ff), + .line_numbers = RGBA(0x777777ff), }, .space_outliner = { .back = RGBA(0x28282800), .title = RGBA(0xffffffff), .text = RGBA(0xc3c3c3ff), .text_hi = RGBA(0xffffffff), - .header = RGBA(0x454545ff), + .header = RGBA(0x282828b3), .header_text = RGBA(0xeeeeeeff), .header_text_hi = RGBA(0xffffffff), - .tab_active = RGBA(0x4b4b4bff), - .tab_inactive = RGBA(0x2b2b2bff), - .tab_back = RGBA(0x232323ff), - .tab_outline = RGBA(0x232323ff), - .button = RGBA(0x424242ff), + .tab_active = RGBA(0x303030ff), + .tab_inactive = RGBA(0x1d1d1dff), + .tab_back = RGBA(0x181818ff), + .tab_outline = RGBA(0x3d3d3dff), + .button = RGBA(0x30303000), .button_title = RGBA(0xffffffff), - .button_text = RGBA(0xe5e5e5ff), + .button_text = RGBA(0xccccccff), .button_text_hi = RGBA(0xffffffff), + .navigation_bar = RGBA(0x1d1d1dff), + .execution_buts = RGBA(0x303030ff), .panelcolors = { - .header = RGBA(0x424242cc), - .back = RGBA(0x333333b3), - .sub_back = RGBA(0x0000003e), + .header = RGBA(0x3d3d3dff), + .back = RGBA(0x3d3d3dff), + .sub_back = RGBA(0x0000001f), }, - .active = RGBA(0x3b5689ff), + .active = RGBA(0x334d80ff), .vertex_size = 3, .outline_width = 1, .facedot_size = 4, .match = RGBA(0x337f334c), - .selected_highlight = RGBA(0x223a5bff), + .selected_highlight = RGBA(0x1d314dff), .selected_object = RGBA(0xe96a00ff), .active_object = RGBA(0xffaf29ff), .edited_object = RGBA(0x00806266), - .row_alternate = RGBA(0xffffff07), + .row_alternate = RGBA(0xffffff04), }, .space_node = { - .back = RGBA(0x1a1a1a00), + .back = RGBA(0x1d1d1d00), .title = RGBA(0xeeeeeeff), .text = RGBA(0xe6e6e6ff), .text_hi = RGBA(0xffffffff), - .header = RGBA(0x424242ff), + .header = RGBA(0x1d1d1db3), .header_text = RGBA(0xeeeeeeff), .header_text_hi = RGBA(0xffffffff), - .tab_active = RGBA(0x4b4b4bff), - .tab_inactive = RGBA(0x2b2b2bff), - .tab_back = RGBA(0x232323ff), - .tab_outline = RGBA(0x232323ff), - .button = RGBA(0x42424200), + .tab_active = RGBA(0x303030ff), + .tab_inactive = RGBA(0x1d1d1dff), + .tab_back = RGBA(0x181818ff), + .tab_outline = RGBA(0x3d3d3dff), + .button = RGBA(0x30303000), .button_title = RGBA(0xffffffff), - .button_text = RGBA(0xe5e5e5ff), + .button_text = RGBA(0xccccccff), .button_text_hi = RGBA(0xffffffff), - .list = RGBA(0x282828ff), + .list = RGBA(0x303030ff), .list_title = RGBA(0xffffffff), .list_text = RGBA(0xccccccff), .list_text_hi = RGBA(0xffffffff), + .navigation_bar = RGBA(0x1d1d1dff), + .execution_buts = RGBA(0x303030ff), .panelcolors = { - .header = RGBA(0x424242cc), - .back = RGBA(0x333333b3), - .sub_back = RGBA(0x0000003e), + .header = RGBA(0x3d3d3dff), + .back = RGBA(0x3d3d3dff), + .sub_back = RGBA(0x0000001f), }, - .shade2 = RGBA(0x7f707064), - .grid = RGBA(0x3d3d3d00), - .wire = RGBA(0x232323ff), + .shade2 = RGBA(0x7f7f7f64), + .grid = RGBA(0x28282800), + .wire = RGBA(0x1a1a1aff), .select = RGBA(0xed5700ff), .active = RGBA(0xffffffff), - .edge_select = RGBA(0xffffffff), - .console_output = RGBA(0x1a1a1aff), + .edge_select = RGBA(0xffffffb3), + .console_output = RGBA(0x000000ff), .vertex_size = 3, .outline_width = 1, .facedot_size = 4, .noodle_curving = 4, .grid_levels = 7, .dash_alpha = 0.5f, - .syntaxl = RGBA(0x3e3e3eff), - .syntaxs = RGBA(0x975b5bff), - .syntaxb = RGBA(0xccb83dff), - .syntaxn = RGBA(0xe64555ff), - .syntaxv = RGBA(0x66c4ffff), - .syntaxc = RGBA(0x426628b9), - .syntaxd = RGBA(0x749797ff), - .syntaxr = RGBA(0x808080ff), - .nodeclass_output = RGBA(0xb33641ff), - .nodeclass_filter = RGBA(0x584d80ff), - .nodeclass_vector = RGBA(0x9b80ffff), - .nodeclass_texture = RGBA(0xe68745ff), - .nodeclass_shader = RGBA(0x63c763ff), + .syntaxl = RGBA(0x303030ff), + .syntaxs = RGBA(0x973c3cff), + .syntaxb = RGBA(0xcccc00ff), + .syntaxn = RGBA(0xff3371ff), + .syntaxv = RGBA(0x12adffff), + .syntaxc = RGBA(0x3b660aff), + .syntaxd = RGBA(0x4c9797ff), + .syntaxr = RGBA(0x8d8d8dff), + .nodeclass_output = RGBA(0x4d0017ff), + .nodeclass_filter = RGBA(0x551a80ff), + .nodeclass_vector = RGBA(0x4d4dffff), + .nodeclass_texture = RGBA(0xe66800ff), + .nodeclass_shader = RGBA(0x24b524ff), .nodeclass_script = RGBA(0x084d4dff), .nodeclass_pattern = RGBA(0x6c696fff), .nodeclass_layout = RGBA(0x6c696fff), - .nodeclass_geometry = RGBA(0x00d7a4ff), - .nodeclass_attribute = RGBA(0x3f5980ff), - .movie = RGBA(0x1a1a1a7d), + .nodeclass_geometry = RGBA(0x00d6a3ff), + .nodeclass_attribute = RGBA(0x001566ff), + .movie = RGBA(0x0f0f0fcc), .gp_vertex_size = 3, .gp_vertex = RGBA(0x97979700), .gp_vertex_select = RGBA(0xff8500ff), }, .space_preferences = { - .back = RGBA(0x42424200), + .back = RGBA(0x30303000), .title = RGBA(0xeeeeeeff), .text = RGBA(0xe6e6e6ff), .text_hi = RGBA(0xffffffff), - .header = RGBA(0x424242ff), + .header = RGBA(0x303030b3), .header_text = RGBA(0xeeeeeeff), .header_text_hi = RGBA(0xffffffff), - .tab_active = RGBA(0x4b4b4bff), - .tab_inactive = RGBA(0x2b2b2bff), - .tab_back = RGBA(0x232323ff), - .tab_outline = RGBA(0x232323ff), - .button = RGBA(0x424242ff), + .tab_active = RGBA(0x303030ff), + .tab_inactive = RGBA(0x1d1d1dff), + .tab_back = RGBA(0x181818ff), + .tab_outline = RGBA(0x3d3d3dff), + .button = RGBA(0x1d1d1dff), .button_title = RGBA(0xffffffff), - .button_text = RGBA(0xe5e5e5ff), + .button_text = RGBA(0xccccccff), .button_text_hi = RGBA(0xffffffff), - .navigation_bar = RGBA(0x4b4b4bff), - .execution_buts = RGBA(0x4b4b4bff), + .navigation_bar = RGBA(0x303030ff), + .execution_buts = RGBA(0x303030ff), .panelcolors = { - .header = RGBA(0x42424200), - .back = RGBA(0x333333b3), - .sub_back = RGBA(0x0000003e), + .header = RGBA(0x3d3d3dff), + .back = RGBA(0x3d3d3dff), + .sub_back = RGBA(0x0000001f), }, .vertex_size = 3, .outline_width = 1, .facedot_size = 4, }, .space_console = { - .back = RGBA(0x30303000), + .back = RGBA(0x1d1d1d00), .title = RGBA(0xeeeeeeff), .text = RGBA(0xe6e6e6ff), .text_hi = RGBA(0xffffffff), - .header = RGBA(0x424242ff), + .header = RGBA(0x303030b3), .header_text = RGBA(0xeeeeeeff), .header_text_hi = RGBA(0xffffffff), - .tab_active = RGBA(0x4b4b4bff), - .tab_inactive = RGBA(0x2b2b2bff), - .tab_back = RGBA(0x232323ff), - .tab_outline = RGBA(0x232323ff), - .button = RGBA(0x424242ff), + .tab_active = RGBA(0x303030ff), + .tab_inactive = RGBA(0x1d1d1dff), + .tab_back = RGBA(0x181818ff), + .tab_outline = RGBA(0x3d3d3dff), + .button = RGBA(0x30303000), .button_title = RGBA(0xffffffff), - .button_text = RGBA(0xe5e5e5ff), + .button_text = RGBA(0xccccccff), .button_text_hi = RGBA(0xffffffff), + .navigation_bar = RGBA(0x1d1d1dff), + .execution_buts = RGBA(0x303030ff), .panelcolors = { - .header = RGBA(0x424242cc), - .back = RGBA(0x333333b3), - .sub_back = RGBA(0x0000003e), + .header = RGBA(0x3d3d3dff), + .back = RGBA(0x3d3d3dff), + .sub_back = RGBA(0x0000001f), }, .console_output = RGBA(0x71a8ffff), .console_input = RGBA(0xf2f2f2ff), @@ -911,46 +917,51 @@ const bTheme U_theme_default = { .facedot_size = 4, }, .space_clip = { - .back = RGBA(0x42424200), + .back = RGBA(0x30303000), .title = RGBA(0xeeeeeeff), .text = RGBA(0xa6a6a6ff), .text_hi = RGBA(0xffffffff), - .header = RGBA(0x424242ff), + .header = RGBA(0x303030b3), .header_text = RGBA(0xeeeeeeff), .header_text_hi = RGBA(0xffffffff), - .tab_active = RGBA(0x4b4b4bff), - .tab_inactive = RGBA(0x2b2b2bff), - .tab_back = RGBA(0x232323ff), - .tab_outline = RGBA(0x232323ff), - .button = RGBA(0x424242ff), + .tab_active = RGBA(0x303030ff), + .tab_inactive = RGBA(0x1d1d1dff), + .tab_back = RGBA(0x181818ff), + .tab_outline = RGBA(0x3d3d3dff), + .button = RGBA(0x30303000), .button_title = RGBA(0xffffffff), - .button_text = RGBA(0xe5e5e5ff), + .button_text = RGBA(0xccccccff), .button_text_hi = RGBA(0xffffffff), - .list = RGBA(0x282828ff), - .list_text = RGBA(0x000000ff), + .list = RGBA(0x303030ff), + .list_title = RGBA(0xffffff00), + .list_text = RGBA(0xb8b8b8ff), .list_text_hi = RGBA(0xffffffff), + .navigation_bar = RGBA(0x1d1d1dff), + .execution_buts = RGBA(0x303030ff), .panelcolors = { - .header = RGBA(0x424242cc), - .back = RGBA(0x333333b3), - .sub_back = RGBA(0x0000003e), + .header = RGBA(0x3d3d3dff), + .back = RGBA(0x3d3d3dff), + .sub_back = RGBA(0x0000001f), }, - .grid = RGBA(0x424242ff), - .strip = RGBA(0x0c0a0a80), + .grid = RGBA(0x181818ff), + .strip = RGBA(0xffffff80), .strip_select = RGBA(0xff8c00ff), - .cframe = RGBA(0x5680c2ff), - .time_scrub_background = RGBA(0x292929e6), - .time_marker_line = RGBA(0x00000060), - .time_marker_line_selected = RGBA(0xffffff60), + .cframe = RGBA(0x4772b3ff), + .time_scrub_background = RGBA(0x181818ff), + .time_marker_line = RGBA(0xffffff4d), + .time_marker_line_selected = RGBA(0xffffffb3), .handle_auto = RGBA(0x909000ff), .handle_align = RGBA(0x803060ff), + .handle_auto_clamped = RGBA(0x99403000), .handle_sel_auto = RGBA(0xf0ff40ff), .handle_sel_align = RGBA(0xf090a0ff), + .handle_sel_auto_clamped = RGBA(0xf0af9000), .vertex_size = 3, .outline_width = 1, .facedot_size = 4, - .handle_vertex_select = RGBA(0xffff00ff), + .handle_vertex_select = RGBA(0xff8500ff), .handle_vertex_size = 5, - .marker = RGBA(0x7f7f00ff), + .marker = RGBA(0x808000ff), .act_marker = RGBA(0xffffffff), .sel_marker = RGBA(0xffff00ff), .dis_marker = RGBA(0x7f0000ff), @@ -963,25 +974,27 @@ const bTheme U_theme_default = { .metadatatext = RGBA(0xffffffff), }, .space_topbar = { - .back = RGBA(0x42424200), + .back = RGBA(0x18181800), .title = RGBA(0xffffffff), .text = RGBA(0xe6e6e6ff), .text_hi = RGBA(0xffffffff), - .header = RGBA(0x232323ff), + .header = RGBA(0x181818b3), .header_text = RGBA(0xeeeeeeff), .header_text_hi = RGBA(0xffffffff), - .tab_active = RGBA(0x4b4b4bff), - .tab_inactive = RGBA(0x2b2b2bff), - .tab_back = RGBA(0x232323ff), - .tab_outline = RGBA(0x232323ff), - .button = RGBA(0x424242ff), + .tab_active = RGBA(0x303030ff), + .tab_inactive = RGBA(0x1d1d1dff), + .tab_back = RGBA(0x181818ff), + .tab_outline = RGBA(0x3d3d3dff), + .button = RGBA(0x30303000), .button_title = RGBA(0xffffffff), - .button_text = RGBA(0xe5e5e5ff), + .button_text = RGBA(0xccccccff), .button_text_hi = RGBA(0xffffffff), + .navigation_bar = RGBA(0x1d1d1dff), + .execution_buts = RGBA(0x303030ff), .panelcolors = { - .header = RGBA(0x424242cc), - .back = RGBA(0x333333b3), - .sub_back = RGBA(0x0000003e), + .header = RGBA(0x3d3d3dff), + .back = RGBA(0x3d3d3dff), + .sub_back = RGBA(0x0000001f), }, .vertex_size = 3, .outline_width = 1, @@ -989,23 +1002,26 @@ const bTheme U_theme_default = { .gp_vertex_size = 3, }, .space_statusbar = { - .back = RGBA(0x2e2e2e00), + .back = RGBA(0x30303000), .title = RGBA(0xffffffff), .text = RGBA(0x838383ff), .text_hi = RGBA(0xffffffff), - .header = RGBA(0x303030ff), - .header_text = RGBA(0xaaaaaaff), + .header = RGBA(0x181818b3), + .header_text = RGBA(0x888888ff), .header_text_hi = RGBA(0xffffffff), - .tab_active = RGBA(0x4b4b4bff), - .tab_inactive = RGBA(0x2b2b2bff), - .tab_back = RGBA(0x232323ff), - .tab_outline = RGBA(0x232323ff), - .button = RGBA(0x353535ff), + .tab_active = RGBA(0x303030ff), + .tab_inactive = RGBA(0x1d1d1dff), + .tab_back = RGBA(0x181818ff), + .tab_outline = RGBA(0x3d3d3dff), + .button = RGBA(0x30303000), + .button_text = RGBA(0xcccccc00), .button_text_hi = RGBA(0xffffffff), + .navigation_bar = RGBA(0x1d1d1dff), + .execution_buts = RGBA(0x303030ff), .panelcolors = { - .header = RGBA(0x424242cc), - .back = RGBA(0x333333b3), - .sub_back = RGBA(0x0000003e), + .header = RGBA(0x3d3d3dff), + .back = RGBA(0x3d3d3dff), + .sub_back = RGBA(0x0000001f), }, .vertex_size = 3, .outline_width = 1, @@ -1017,22 +1033,29 @@ const bTheme U_theme_default = { .title = RGBA(0xffffffff), .text = RGBA(0xc3c3c3ff), .text_hi = RGBA(0xffffffff), - .header = RGBA(0x454545ff), + .header = RGBA(0x303030b3), .header_text = RGBA(0xeeeeeeff), .header_text_hi = RGBA(0xffffffff), - .tab_active = RGBA(0x4b4b4bff), - .tab_inactive = RGBA(0x2b2b2bff), - .tab_back = RGBA(0x232323ff), - .tab_outline = RGBA(0x232323ff), - .button = RGBA(0x424242ff), + .tab_active = RGBA(0x303030ff), + .tab_inactive = RGBA(0x1d1d1dff), + .tab_back = RGBA(0x181818ff), + .tab_outline = RGBA(0x3d3d3dff), + .button = RGBA(0x30303000), .button_title = RGBA(0xffffffff), - .button_text = RGBA(0xe5e5e5ff), + .button_text = RGBA(0xccccccff), .button_text_hi = RGBA(0xffffffff), + .list = RGBA(0x303030ff), + .list_title = RGBA(0xc3c3c3ff), + .list_text = RGBA(0xc3c3c3ff), + .list_text_hi = RGBA(0xffffffff), + .navigation_bar = RGBA(0x1d1d1dff), + .execution_buts = RGBA(0x303030ff), .panelcolors = { - .header = RGBA(0x424242cc), - .back = RGBA(0x333333b3), - .sub_back = RGBA(0x0000003e), + .header = RGBA(0x3d3d3dff), + .back = RGBA(0x3d3d3dff), + .sub_back = RGBA(0x0000001f), }, + .hilite = RGBA(0x80808080), .active = RGBA(0x3b5689ff), .vertex_size = 3, .outline_width = 1, @@ -1042,12 +1065,7 @@ const bTheme U_theme_default = { .selected_object = RGBA(0xe96a00ff), .active_object = RGBA(0xffaf29ff), .edited_object = RGBA(0x00806266), - .row_alternate = RGBA(0xffffff07), - .list = RGBA(0x424242ff), - .list_title = RGBA(0xc3c3c3ff), - .list_text = RGBA(0xc3c3c3ff), - .list_text_hi = RGBA(0xffffff), - .hilite = RGBA(0x80808080), + .row_alternate = RGBA(0xffffff04), }, .tarm = { { diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index d39dc8bc406..e5b63e7286b 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -39,7 +39,7 @@ extern "C" { /* Blender file format version. */ #define BLENDER_FILE_VERSION BLENDER_VERSION -#define BLENDER_FILE_SUBVERSION 39 +#define BLENDER_FILE_SUBVERSION 40 /* Minimum Blender version that supports reading file written with the current * version. Older Blender versions will test this and show a warning if the file diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c index 9bd6280dbf4..68faa4c0672 100644 --- a/source/blender/blenloader/intern/versioning_300.c +++ b/source/blender/blenloader/intern/versioning_300.c @@ -2080,17 +2080,7 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - /** - * Versioning code until next subversion bump goes here. - * - * \note Be sure to check when bumping the version: - * - "versioning_userdef.c", #blo_do_versions_userdef - * - "versioning_userdef.c", #do_versions_theme - * - * \note Keep this message at the bottom of the function. - */ - - { + if (!MAIN_VERSION_ATLEAST(bmain, 300, 40)) { /* Update the `idnames` for renamed geometry and function nodes. */ LISTBASE_FOREACH (bNodeTree *, ntree, &bmain->nodetrees) { if (ntree->type != NTREE_GEOMETRY) { @@ -2100,7 +2090,6 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain) version_geometry_nodes_set_position_node_offset(ntree); version_node_id(ntree, GEO_NODE_LEGACY_VOLUME_TO_MESH, "GeometryNodeLegacyVolumeToMesh"); } - /* Keep this block, even when empty. */ /* Add storage to viewer node. */ LISTBASE_FOREACH (bNodeTree *, ntree, &bmain->nodetrees) { @@ -2154,4 +2143,17 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain) } } } + + /** + * Versioning code until next subversion bump goes here. + * + * \note Be sure to check when bumping the version: + * - "versioning_userdef.c", #blo_do_versions_userdef + * - "versioning_userdef.c", #do_versions_theme + * + * \note Keep this message at the bottom of the function. + */ + { + /* Keep this block, even when empty. */ + } } diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c index df59cd3afa9..4234570af6c 100644 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@ -58,10 +58,6 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) { #define USER_VERSION_ATLEAST(ver, subver) MAIN_VERSION_ATLEAST(userdef, ver, subver) - if (!USER_VERSION_ATLEAST(280, 20)) { - memcpy(btheme, &U_theme_default, sizeof(*btheme)); - } - #define FROM_DEFAULT_V4_UCHAR(member) copy_v4_v4_uchar(btheme->member, U_theme_default.member) if (!USER_VERSION_ATLEAST(280, 25)) { @@ -317,6 +313,10 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) btheme->space_node.grid_levels = 7; } + if (!USER_VERSION_ATLEAST(300, 40)) { + memcpy(btheme, &U_theme_default, sizeof(*btheme)); + } + /** * Versioning code until next subversion bump goes here. * @@ -936,6 +936,14 @@ void blo_do_versions_userdef(UserDef *userdef) } } + if (!USER_VERSION_ATLEAST(300, 40)) { + LISTBASE_FOREACH (uiStyle *, style, &userdef->uistyles) { + const int default_title_points = 11; /* UI_DEFAULT_TITLE_POINTS */ + style->paneltitle.points = default_title_points; + style->grouplabel.points = default_title_points; + } + } + /** * Versioning code until next subversion bump goes here. * diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index 0f290d4255b..39d70f15a3a 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -247,7 +247,7 @@ enum { #define UI_DEFAULT_TEXT_POINTS 11 /* Larger size used for title text. */ -#define UI_DEFAULT_TITLE_POINTS 12 +#define UI_DEFAULT_TITLE_POINTS 11 #define UI_PANEL_WIDTH 340 #define UI_COMPACT_PANEL_WIDTH 160 diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index ad7c6332ee9..aece2e58f1e 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -252,10 +252,11 @@ const uchar *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid) case TH_HEADER_ACTIVE: cp = ts->header; + const int factor = 5; /* Lighten the header color when editor is active. */ - header_active[0] = cp[0] > 245 ? cp[0] - 10 : cp[0] + 10; - header_active[1] = cp[1] > 245 ? cp[1] - 10 : cp[1] + 10; - header_active[2] = cp[2] > 245 ? cp[2] - 10 : cp[2] + 10; + header_active[0] = cp[0] > 245 ? cp[0] - factor : cp[0] + factor; + header_active[1] = cp[1] > 245 ? cp[1] - factor : cp[1] + factor; + header_active[2] = cp[2] > 245 ? cp[2] - factor : cp[2] + factor; header_active[3] = cp[3]; cp = header_active; break; |