From 28bd5a7832aa6db10df6e34106ea2e60c09e0af7 Mon Sep 17 00:00:00 2001 From: quackarooni Date: Thu, 26 Jun 2025 15:05:37 +0200 Subject: [PATCH] Fix #140933: "Group Socket Node" theme property left unset The theme property for group socket nodes was set to `#000000` for default themes, which looked out of place against the other node header colors. This patch adds colors to both the Blender Dark & Light themes that should resemble their counterparts before 2ea3cd2188. Colors: Blender Dark - `#1d1d1d` Blender Light - `#3d3d3d` Pull Request: https://projects.blender.org/blender/blender/pulls/141011 --- release/datafiles/userdef/userdef_default_theme.c | 2 +- scripts/presets/interface_theme/Blender_Light.xml | 2 +- source/blender/blenkernel/BKE_blender_version.h | 2 +- source/blender/blenloader/intern/versioning_userdef.cc | 4 ++++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c index 31efe128d03..3a3beabce63 100644 --- a/release/datafiles/userdef/userdef_default_theme.c +++ b/release/datafiles/userdef/userdef_default_theme.c @@ -727,7 +727,7 @@ const bTheme U_theme_default = { .select = RGBA(0xed5700ff), .active = RGBA(0xffffffff), .edge_select = RGBA(0xffffffb3), - .console_output = RGBA(0x000000ff), + .console_output = RGBA(0x1d1d1dff), .vertex_size = 3, .outline_width = 1, .facedot_size = 4, diff --git a/scripts/presets/interface_theme/Blender_Light.xml b/scripts/presets/interface_theme/Blender_Light.xml index 3fea32adb57..412351ffe58 100644 --- a/scripts/presets/interface_theme/Blender_Light.xml +++ b/scripts/presets/interface_theme/Blender_Light.xml @@ -917,7 +917,7 @@ converter_node="#4482a3" color_node="#8e8e3f" group_node="#566643" - group_socket_node="#000000" + group_socket_node="#3d3d3d" frame_node="#0f0f0fcc" matte_node="#7a5656" distor_node="#5d7a7a" diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 296d9e103b1..301ad520285 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -27,7 +27,7 @@ /* Blender file format version. */ #define BLENDER_FILE_VERSION BLENDER_VERSION -#define BLENDER_FILE_SUBVERSION 28 +#define BLENDER_FILE_SUBVERSION 29 /* 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 935c11df2df..c60be0fc42f 100644 --- a/source/blender/blenloader/intern/versioning_userdef.cc +++ b/source/blender/blenloader/intern/versioning_userdef.cc @@ -341,6 +341,10 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) FROM_DEFAULT_V4_UCHAR(space_properties.button); } + if (!USER_VERSION_ATLEAST(500, 29)) { + FROM_DEFAULT_V4_UCHAR(space_node.console_output); + } + /** * Always bump subversion in BKE_blender_version.h when adding versioning * code here, and wrap it inside a USER_VERSION_ATLEAST check.