[Bf-blender-cvs] [47b9ed24090] master: Cleanup: Rename flag for node socket link status
Hans Goudey
noreply at git.blender.org
Thu Dec 29 16:31:44 CET 2022
Commit: 47b9ed24090d5badd8a93fd890488afc821530c8
Author: Hans Goudey
Date: Thu Dec 29 10:28:29 2022 -0500
Branches: master
https://developer.blender.org/rB47b9ed24090d5badd8a93fd890488afc821530c8
Cleanup: Rename flag for node socket link status
"Is linked" is much clearer than "in use"
===================================================================
M source/blender/blenkernel/intern/node_tree_update.cc
M source/blender/blenloader/intern/versioning_260.c
M source/blender/blenloader/intern/versioning_common.cc
M source/blender/blenloader/intern/versioning_common.h
M source/blender/blenloader/intern/versioning_cycles.c
M source/blender/editors/space_node/drawnode.cc
M source/blender/editors/space_node/node_relationships.cc
M source/blender/makesdna/DNA_node_types.h
M source/blender/makesrna/intern/rna_nodetree.c
===================================================================
diff --git a/source/blender/blenkernel/intern/node_tree_update.cc b/source/blender/blenkernel/intern/node_tree_update.cc
index 2750d6ce0c8..d01cbd1d62d 100644
--- a/source/blender/blenkernel/intern/node_tree_update.cc
+++ b/source/blender/blenkernel/intern/node_tree_update.cc
@@ -523,10 +523,10 @@ class NodeTreeMainUpdater {
{
tree.ensure_topology_cache();
for (bNodeSocket *socket : tree.all_sockets()) {
- socket->flag &= ~SOCK_IN_USE;
+ socket->flag &= ~SOCK_IS_LINKED;
for (const bNodeLink *link : socket->directly_linked_links()) {
if (!link->is_muted()) {
- socket->flag |= SOCK_IN_USE;
+ socket->flag |= SOCK_IS_LINKED;
break;
}
}
diff --git a/source/blender/blenloader/intern/versioning_260.c b/source/blender/blenloader/intern/versioning_260.c
index ad7d08270c2..8cfd66576ff 100644
--- a/source/blender/blenloader/intern/versioning_260.c
+++ b/source/blender/blenloader/intern/versioning_260.c
@@ -225,22 +225,22 @@ static void do_versions_nodetree_socket_use_flags_2_62(bNodeTree *ntree)
for (node = ntree->nodes.first; node; node = node->next) {
for (sock = node->inputs.first; sock; sock = sock->next) {
- sock->flag &= ~SOCK_IN_USE;
+ sock->flag &= ~SOCK_IS_LINKED;
}
for (sock = node->outputs.first; sock; sock = sock->next) {
- sock->flag &= ~SOCK_IN_USE;
+ sock->flag &= ~SOCK_IS_LINKED;
}
}
for (sock = ntree->inputs.first; sock; sock = sock->next) {
- sock->flag &= ~SOCK_IN_USE;
+ sock->flag &= ~SOCK_IS_LINKED;
}
for (sock = ntree->outputs.first; sock; sock = sock->next) {
- sock->flag &= ~SOCK_IN_USE;
+ sock->flag &= ~SOCK_IS_LINKED;
}
for (link = ntree->links.first; link; link = link->next) {
- link->fromsock->flag |= SOCK_IN_USE;
- link->tosock->flag |= SOCK_IN_USE;
+ link->fromsock->flag |= SOCK_IS_LINKED;
+ link->tosock->flag |= SOCK_IS_LINKED;
}
}
diff --git a/source/blender/blenloader/intern/versioning_common.cc b/source/blender/blenloader/intern/versioning_common.cc
index 0bc3d7ee8ce..7bbcfa8a203 100644
--- a/source/blender/blenloader/intern/versioning_common.cc
+++ b/source/blender/blenloader/intern/versioning_common.cc
@@ -219,15 +219,15 @@ void version_socket_update_is_used(bNodeTree *ntree)
{
for (bNode *node : ntree->all_nodes()) {
LISTBASE_FOREACH (bNodeSocket *, socket, &node->inputs) {
- socket->flag &= ~SOCK_IN_USE;
+ socket->flag &= ~SOCK_IS_LINKED;
}
LISTBASE_FOREACH (bNodeSocket *, socket, &node->outputs) {
- socket->flag &= ~SOCK_IN_USE;
+ socket->flag &= ~SOCK_IS_LINKED;
}
}
LISTBASE_FOREACH (bNodeLink *, link, &ntree->links) {
- link->fromsock->flag |= SOCK_IN_USE;
- link->tosock->flag |= SOCK_IN_USE;
+ link->fromsock->flag |= SOCK_IS_LINKED;
+ link->tosock->flag |= SOCK_IS_LINKED;
}
}
diff --git a/source/blender/blenloader/intern/versioning_common.h b/source/blender/blenloader/intern/versioning_common.h
index a8844d076b3..c99fb60be30 100644
--- a/source/blender/blenloader/intern/versioning_common.h
+++ b/source/blender/blenloader/intern/versioning_common.h
@@ -88,7 +88,7 @@ struct bNodeSocket *version_node_add_socket_if_not_exist(struct bNodeTree *ntree
const char *name);
/**
- * The versioning code generally expects `SOCK_IN_USE` to be set correctly. This function updates
+ * The versioning code generally expects `SOCK_IS_LINKED` to be set correctly. This function updates
* the flag on all sockets after changes to the node tree.
*/
void version_socket_update_is_used(bNodeTree *ntree);
diff --git a/source/blender/blenloader/intern/versioning_cycles.c b/source/blender/blenloader/intern/versioning_cycles.c
index 0a9d40e161a..67772140466 100644
--- a/source/blender/blenloader/intern/versioning_cycles.c
+++ b/source/blender/blenloader/intern/versioning_cycles.c
@@ -40,7 +40,7 @@
static bool socket_is_used(bNodeSocket *sock)
{
- return sock->flag & SOCK_IN_USE;
+ return sock->flag & SOCK_IS_LINKED;
}
static float *cycles_node_socket_float_value(bNodeSocket *socket)
@@ -371,7 +371,7 @@ static void light_emission_node_to_energy(Light *light, float *energy, float col
bNodeSocket *strength_socket = nodeFindSocket(emission_node, SOCK_IN, "Strength");
bNodeSocket *color_socket = nodeFindSocket(emission_node, SOCK_IN, "Color");
- if ((strength_socket->flag & SOCK_IN_USE) || (color_socket->flag & SOCK_IN_USE)) {
+ if ((strength_socket->flag & SOCK_IS_LINKED) || (color_socket->flag & SOCK_IS_LINKED)) {
return;
}
diff --git a/source/blender/editors/space_node/drawnode.cc b/source/blender/editors/space_node/drawnode.cc
index 16771ef7347..7cca456a46f 100644
--- a/source/blender/editors/space_node/drawnode.cc
+++ b/source/blender/editors/space_node/drawnode.cc
@@ -1293,7 +1293,7 @@ static void std_node_socket_draw(
return;
}
- if ((sock->in_out == SOCK_OUT) || (sock->flag & SOCK_IN_USE) || (sock->flag & SOCK_HIDE_VALUE)) {
+ if ((sock->in_out == SOCK_OUT) || (sock->flag & SOCK_IS_LINKED) || (sock->flag & SOCK_HIDE_VALUE)) {
node_socket_button_label(C, layout, ptr, node_ptr, text);
return;
}
diff --git a/source/blender/editors/space_node/node_relationships.cc b/source/blender/editors/space_node/node_relationships.cc
index 2d136c58edc..222fae7cbc2 100644
--- a/source/blender/editors/space_node/node_relationships.cc
+++ b/source/blender/editors/space_node/node_relationships.cc
@@ -176,7 +176,7 @@ static bool socket_is_available(bNodeTree * /*ntree*/, bNodeSocket *sock, const
return false;
}
- if (!allow_used && (sock->flag & SOCK_IN_USE)) {
+ if (!allow_used && (sock->flag & SOCK_IS_LINKED)) {
/* Multi input sockets are available (even if used). */
if (!(sock->flag & SOCK_MULTI_INPUT)) {
return false;
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index d46d38a4f87..cdc69662534 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -256,7 +256,7 @@ typedef enum eNodeSocketFlag {
/** Hidden is user defined, to hide unused sockets. */
SOCK_HIDDEN = (1 << 1),
/** For quick check if socket is linked. */
- SOCK_IN_USE = (1 << 2),
+ SOCK_IS_LINKED = (1 << 2),
/** Unavailable is for dynamic sockets. */
SOCK_UNAVAIL = (1 << 3),
// /** DEPRECATED dynamic socket (can be modified by user) */
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index aa42e9422e2..300bca9e369 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -2892,7 +2892,7 @@ static void rna_NodeSocket_hide_set(PointerRNA *ptr, bool value)
bNodeSocket *sock = (bNodeSocket *)ptr->data;
/* don't hide linked sockets */
- if (sock->flag & SOCK_IN_USE) {
+ if (sock->flag & SOCK_IS_LINKED) {
return;
}
@@ -11057,7 +11057,7 @@ static void rna_def_node_socket(BlenderRNA *brna)
RNA_def_property_update(prop, NC_NODE | NA_EDITED, NULL);
prop = RNA_def_property(srna, "is_linked", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "flag", SOCK_IN_USE);
+ RNA_def_property_boolean_sdna(prop, NULL, "flag", SOCK_IS_LINKED);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_ui_text(prop, "Linked", "True if the socket is connected");
More information about the Bf-blender-cvs
mailing list