diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c index d2480b073dc..5bdc41ebed3 100644 --- a/release/datafiles/userdef/userdef_default_theme.c +++ b/release/datafiles/userdef/userdef_default_theme.c @@ -289,7 +289,7 @@ const bTheme U_theme_default = { }, .regions = { .asset_shelf = { - .back = RGBA(0x303030ff), + .back = RGBA(0x303030e6), .header_back = RGBA(0x1d1d1dff), }, .channels = { @@ -298,10 +298,10 @@ const bTheme U_theme_default = { .text_selected = RGBA(0xffaf23ff), }, .scrubbing = { - .back = RGBA(0x161616ff), - .text = RGBA(0xc3c3c3ff), - .time_marker = RGBA(0xffffff4d), - .time_marker_selected = RGBA(0xffffffb3), + .back = RGBA(0x1d1d1dff), + .text = RGBA(0x808080ff), + .time_marker = RGBA(0xffffff80), + .time_marker_selected = RGBA(0xffffffff), }, .sidebars = { .back = RGBA(0x30303000), @@ -312,7 +312,6 @@ const bTheme U_theme_default = { .anim = { .playhead = RGBA(0x4772b3ff), .preview_range = RGBA(0xa14d0066), - .scene_strip_range = RGBA(0x00000080), .channels = RGBA(0x194e8080), .channels_sub = RGBA(0x0f2c4d80), .channel_group = RGBA(0x1a332d37), @@ -333,6 +332,7 @@ const bTheme U_theme_default = { .keyframe_generated_selected = RGBA(0xa28962ff), .long_key = RGBA(0xffffff1f), .long_key_selected = RGBA(0xff8c0099), + .scene_strip_range = RGBA(0x00000080), }, .curves = { .handle_free = RGBA(0x745900ff), @@ -648,15 +648,15 @@ const bTheme U_theme_default = { .row_alternate = RGBA(0xffffff04), }, .space_node = { - .back = RGBA(0x1d1d1d00), + .back = RGBA(0x1a1a1a00), .title = RGBA(0xeeeeeeff), .text = RGBA(0xe6e6e6ff), .text_hi = RGBA(0xffffffff), - .header = RGBA(0x1d1d1db3), + .header = RGBA(0x1a1a1ab3), .header_text = RGBA(0xeeeeeeff), .header_text_hi = RGBA(0xffffffff), .shade2 = RGBA(0x7f7f7f64), - .grid = RGBA(0x28282800), + .grid = RGBA(0x30303000), .wire = RGBA(0x1a1a1aff), .select = RGBA(0xed5700ff), .active = RGBA(0xffffffff), diff --git a/source/blender/blenloader/intern/versioning_userdef.cc b/source/blender/blenloader/intern/versioning_userdef.cc index a2aaebab74f..676d2c80a9c 100644 --- a/source/blender/blenloader/intern/versioning_userdef.cc +++ b/source/blender/blenloader/intern/versioning_userdef.cc @@ -390,6 +390,26 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) FROM_DEFAULT_V4_UCHAR(common.anim.scene_strip_range); } + /* Reset the theme due to compatibility breaking changes in 5.0. */ + if (!USER_VERSION_ATLEAST(500, 111)) { + MEMCPY_STRUCT_AFTER(btheme, &U_theme_default, name); + /* Update text styles to match. */ + LISTBASE_FOREACH (uiStyle *, style, &userdef->uistyles) { + style->paneltitle.points = 11.0f; + style->paneltitle.shadow = 3; + style->paneltitle.shadowalpha = 0.5f; + style->paneltitle.shadowcolor = 0.0f; + style->widget.points = 11.0f; + style->widget.shadow = 1; + style->widget.shadowalpha = 0.5f; + style->widget.shadowcolor = 0.0f; + style->tooltip.shadow = 1; + style->tooltip.points = 11.0f; + style->tooltip.shadowalpha = 0.5f; + style->tooltip.shadowcolor = 0.0f; + } + } + if (!USER_VERSION_ATLEAST(501, 3)) { FROM_DEFAULT_V4_UCHAR(space_action.anim_interpolation_other); FROM_DEFAULT_V4_UCHAR(space_action.anim_interpolation_constant);