archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Nodes: use green color again for shader sockets and shader category

Browse Source 
The green is still distinct from the more turquoise use for geometry, and
they are never used in the same node graph. The use of red makes sense, but
would need changes to other sockets and categories to set it apart well.

Ref T82689
This commit is contained in:
Brecht Van Lommel
2021-01-13 12:25:31 +01:00
parent 5d826866a3
commit 09fe0e8aa9
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -836,7 +836,7 @@ const bTheme U_theme_default = {
.nodeclass_filter = RGBA(0x584d80ff),
.nodeclass_vector = RGBA(0x9b80ffff),
.nodeclass_texture = RGBA(0xe68745ff),
.nodeclass_shader = RGBA(0xea7581ff),
.nodeclass_shader = RGBA(0x63c763ff),
.nodeclass_script = RGBA(0x084d4dff),
.nodeclass_pattern = RGBA(0x6c696fff),
.nodeclass_layout = RGBA(0x6c696fff),

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

@@ -39,7 +39,7 @@ extern "C" {
/* Blender file format version. */
#define BLENDER_FILE_VERSION BLENDER_VERSION
#define BLENDER_FILE_SUBVERSION 11
#define BLENDER_FILE_SUBVERSION 12
/* Minimum Blender version that supports reading file written with the current
* version. Older Blender versions will test this and show a warning if the file

2
source/blender/blenloader/intern/versioning_userdef.c
View File

@@ -257,7 +257,7 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
FROM_DEFAULT_V4_UCHAR(space_node.nodeclass_attribute);
}
if (!USER_VERSION_ATLEAST(292, 6)) {
if (!USER_VERSION_ATLEAST(292, 12)) {
FROM_DEFAULT_V4_UCHAR(space_node.nodeclass_shader);
}

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

@@ -3525,7 +3525,7 @@ static const float std_node_socket_colors[][4] = {
{0.63, 0.63, 0.63, 1.0}, /* SOCK_FLOAT */
{0.39, 0.39, 0.78, 1.0}, /* SOCK_VECTOR */
{0.78, 0.78, 0.16, 1.0}, /* SOCK_RGBA */
{0.88, 0.43, 0.46, 1.0}, /* SOCK_SHADER */
{0.39, 0.78, 0.39, 1.0}, /* SOCK_SHADER */
{0.80, 0.65, 0.84, 1.0}, /* SOCK_BOOLEAN */
{0.0, 0.0, 0.0, 1.0}, /*__SOCK_MESH (deprecated) */
{0.25, 0.75, 0.26, 1.0}, /* SOCK_INT */