From 5168ee10364cc4ab2c9e41f6fa920aa5ccd01341 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Mon, 28 Jul 2025 16:11:36 +0200 Subject: [PATCH] Nodes: use better color for closures Change colors according to #143056. Pull Request: https://projects.blender.org/blender/blender/pulls/143465 --- release/datafiles/userdef/userdef_default_theme.c | 2 +- source/blender/blenkernel/BKE_blender_version.h | 2 +- source/blender/blenloader/intern/versioning_userdef.cc | 4 ++++ source/blender/editors/space_node/drawnode.cc | 2 +- 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 3a3beabce63..4af6729a477 100644 --- a/release/datafiles/userdef/userdef_default_theme.c +++ b/release/datafiles/userdef/userdef_default_theme.c @@ -755,7 +755,7 @@ const bTheme U_theme_default = { .node_zone_simulation = RGBA(0x66416233), .node_zone_repeat = RGBA(0x76512f33), .node_zone_foreach_geometry_element = RGBA(0x33527f33), - .node_zone_closure = RGBA(0x527f3333), + .node_zone_closure = RGBA(0x707F6633), .movie = RGBA(0x0f0f0fcc), .gp_vertex_size = 3, .gp_vertex = RGBA(0x97979700), diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 2e57bb4bd07..fb9c118e5ef 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 43 +#define BLENDER_FILE_SUBVERSION 44 /* 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 c60be0fc42f..f03b25233e7 100644 --- a/source/blender/blenloader/intern/versioning_userdef.cc +++ b/source/blender/blenloader/intern/versioning_userdef.cc @@ -345,6 +345,10 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) FROM_DEFAULT_V4_UCHAR(space_node.console_output); } + if (!USER_VERSION_ATLEAST(405, 44)) { + FROM_DEFAULT_V4_UCHAR(space_node.node_zone_closure); + } + /** * Always bump subversion in BKE_blender_version.h when adding versioning * code here, and wrap it inside a USER_VERSION_ATLEAST check. diff --git a/source/blender/editors/space_node/drawnode.cc b/source/blender/editors/space_node/drawnode.cc index 216727a5582..4ec3216faa8 100644 --- a/source/blender/editors/space_node/drawnode.cc +++ b/source/blender/editors/space_node/drawnode.cc @@ -969,7 +969,7 @@ static const float std_node_socket_colors[][4] = { {0.40, 0.40, 0.40, 1.0}, /* SOCK_MENU */ {0.72, 0.20, 0.52, 1.0}, /* SOCK_MATRIX */ {0.30, 0.50, 0.50, 1.0}, /* SOCK_BUNDLE */ - {0.50, 0.60, 0.40, 1.0}, /* SOCK_CLOSURE */ + {0.43, 0.50, 0.40, 1.0}, /* SOCK_CLOSURE */ }; void std_node_socket_colors_get(int socket_type, float *r_color)