[Bf-blender-cvs] [bfec984cf82] master: UI: Theme refresh for Blender v3.0
Pablo Vazquez
noreply at git.blender.org
Wed Oct 27 18:29:20 CEST 2021
Commit: bfec984cf82a64a74ee86a902348a46e3c231b8f
Author: Pablo Vazquez
Date: Wed Oct 27 18:20:40 2021 +0200
Branches: master
https://developer.blender.org/rBbfec984cf82a64a74ee86a902348a46e3c231b8f
UI: Theme refresh for Blender v3.0
{F11548100, size=full}
To celebrate the beginning of a new series, it feels like the right time to
give the theme a fresh look while improving on what already works.
The aim of this refresh is to keep a familiar look but with polishing touches
here and there. Like new paint on the walls of your well known house.
The theme for Blender 2.8 was well received but presented a few flaws.
* Transparency on menus and tooltips reduce readability
* Mismatch on certain colors, especially outlines of connected widgets
* Active/open menus highlight was not prominent enough
* Header background mismatch in some editors
At the same time we can make use of new features in 3.0:
* Make panels look like panels again (like in v2.3!)
* Make use of roundness in more widgets
* Since nodes are no longer hard-coded to be transparent, tweak opacity and saturation
* Tweak colors for the new dot grid
This update does not include:
* Meshes in edit mode to match greenish object-data color. This needs tweaks in the code to improve contrast.
* A copy of the Blender 2.8x legacy theme. This could be added to the community themes (shouldn't cost much maintenance, I hope)
There will be certainly small tweaks to do here and there, I've been working using this theme
for months but there can be areas that are missing update. The overall style is presented here.
This commit bumps the file subversion.
Reviewed By: #user_interface, Severin
Differential Revision: https://developer.blender.org/D13008
===================================================================
M release/datafiles/userdef/userdef_default_theme.c
M source/blender/blenkernel/BKE_blender_version.h
M source/blender/blenloader/intern/versioning_300.c
M source/blender/blenloader/intern/versioning_userdef.c
M source/blender/editors/include/UI_interface.h
M source/blender/editors/interface/resources.c
===================================================================
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(0xcc6
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list