griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Geometry Nodes: Change closure color, reset repeat zone color

Browse Source 
Follow up to f646948ace
The repeat zone color is changed back to the color it used in 4.5, to
avoid the need for people to re-learn the color. The closure socket and
zone share the same color, which is made more yellow-ish to distinguish
it from the bundle socket color.
This commit is contained in:
Hans Goudey
2025-08-07 15:27:02 -04:00
parent 6dc9cd366a
commit 02181347ce
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
release/datafiles/userdef/userdef_default_theme.c
View File

@@ -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),

2
source/blender/blenkernel/BKE_blender_version.h
View File

@@ -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

5
source/blender/blenloader/intern/versioning_userdef.cc
View File

@@ -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.

2
source/blender/editors/space_node/drawnode.cc
View File

@@ -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)