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

Merge branch 'blender-v3.6-release'

Browse Source
This commit is contained in:
Leon Schittek
2023-06-05 20:23:45 +02:00
parent 90a0f39c02 e6a8c45fd9
commit 27184c4643
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1299,7 +1299,7 @@ static void std_node_socket_draw(
}
if ((sock->in_out == SOCK_OUT) || (sock->flag & SOCK_HIDE_VALUE) ||
((sock->flag & SOCK_IS_LINKED) && !(sock->link->is_muted())))
((sock->flag & SOCK_IS_LINKED) && !all_links_muted(*sock)))
{
node_socket_button_label(C, layout, ptr, node_ptr, text);
return;

1
source/blender/editors/space_node/node_intern.hh
View File

@@ -294,6 +294,7 @@ void NODE_OT_group_edit(wmOperatorType *ot);
/* node_relationships.cc */
void update_multi_input_indices_for_removed_links(bNode &node);
bool all_links_muted(const bNodeSocket &socket);
void NODE_OT_link(wmOperatorType *ot);
void NODE_OT_link_make(wmOperatorType *ot);

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

@@ -1588,7 +1588,7 @@ void NODE_OT_links_cut(wmOperatorType *ot)
/** \name Mute Links Operator
* \{ */
static bool all_links_muted(const bNodeSocket &socket)
bool all_links_muted(const bNodeSocket &socket)
{
for (const bNodeLink *link : socket.directly_linked_links()) {
if (!(link->flag & NODE_LINK_MUTED)) {