From fd1a5b52c1b25e8ce6c2a875a990ecfc80b934f5 Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Tue, 31 Oct 2023 13:04:59 +0100 Subject: [PATCH 1/2] Theme: do not mark pulldown menus as active on hover Match the color of regular menu items on hover. Do versioning comes right after since it's needed for another bug. --- release/datafiles/userdef/userdef_default_theme.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c index 0edc3fcf40c..03008da1059 100644 --- a/release/datafiles/userdef/userdef_default_theme.c +++ b/release/datafiles/userdef/userdef_default_theme.c @@ -125,10 +125,10 @@ const bTheme U_theme_default = { .roundness = 0.2f, }, .wcol_pulldown = { - .outline = RGBA(0x3d3d3dff), - .inner = RGBA(0x22222266), - .inner_sel = RGBA(0x4772b3b3), - .item = RGBA(0x727272ff), + .outline = RGBA(0x3d3d3d00), + .inner = RGBA(0x22222200), + .inner_sel = RGBA(0xffffff1a), + .item = RGBA(0xffffff8f), .text = RGBA(0xd9d9d9ff), .text_sel = RGBA(0xffffffff), .roundness = 0.2f, From 86ccbc43532001eae3704144eddab24e31c8761a Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Tue, 31 Oct 2023 13:07:54 +0100 Subject: [PATCH 2/2] Fix #113683: Wrong colors in UIList items after importing 3.6 theme Theme changes for active/hover elements in 4.0 were missing versioning. --- source/blender/blenkernel/BKE_blender_version.h | 2 +- source/blender/blenloader/intern/versioning_userdef.cc | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 030e21d41df..e3cccd4e1d4 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -29,7 +29,7 @@ extern "C" { /* Blender file format version. */ #define BLENDER_FILE_VERSION BLENDER_VERSION -#define BLENDER_FILE_SUBVERSION 34 +#define BLENDER_FILE_SUBVERSION 35 /* Minimum Blender version that supports reading file written with the current * version. Older Blender versions will test this and cancel loading the file, showing a warning to diff --git a/source/blender/blenloader/intern/versioning_userdef.cc b/source/blender/blenloader/intern/versioning_userdef.cc index 7e785184212..a856410f273 100644 --- a/source/blender/blenloader/intern/versioning_userdef.cc +++ b/source/blender/blenloader/intern/versioning_userdef.cc @@ -129,6 +129,10 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) FROM_DEFAULT_V4_UCHAR(space_sequencer.transition); } + if (!USER_VERSION_ATLEAST(400, 35)) { + memcpy(btheme, &U_theme_default, sizeof(*btheme)); + } + /** * Versioning code until next subversion bump goes here. *