diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c index 55d768d76cc..d6f14ec2720 100644 --- a/release/datafiles/userdef/userdef_default_theme.c +++ b/release/datafiles/userdef/userdef_default_theme.c @@ -755,9 +755,9 @@ const bTheme U_theme_default = { .nodeclass_geometry = RGBA(0x1d725eff), .nodeclass_attribute = RGBA(0x1d2546ff), .node_zone_simulation = RGBA(0x66416233), - .node_zone_repeat = RGBA(0x708C7233), + .node_zone_repeat = RGBA(0x76512f33), .node_zone_foreach_geometry_element = RGBA(0x33527f33), - .node_zone_closure = RGBA(0x734F4233), + .node_zone_closure = RGBA(0x7D7D3A33), .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 75e37e6bc3d..ca9b153f37a 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 54 +#define BLENDER_FILE_SUBVERSION 55 /* 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 74d63b9a579..f763adfb0e5 100644 --- a/source/blender/blenloader/intern/versioning_userdef.cc +++ b/source/blender/blenloader/intern/versioning_userdef.cc @@ -363,6 +363,11 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) FROM_DEFAULT_V4_UCHAR(tui.waxis); } + if (!USER_VERSION_ATLEAST(405, 55)) { + FROM_DEFAULT_V4_UCHAR(space_node.node_zone_closure); + FROM_DEFAULT_V4_UCHAR(space_node.node_zone_repeat); + } + /** * 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 adcc9fb7464..fc14fc77e0d 100644 --- a/source/blender/editors/space_node/drawnode.cc +++ b/source/blender/editors/space_node/drawnode.cc @@ -968,7 +968,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.45, 0.30, 0.26, 1.0}, /* SOCK_CLOSURE */ + {0.49, 0.49, 0.23, 1.0}, /* SOCK_CLOSURE */ }; void std_node_socket_colors_get(int socket_type, float *r_color)