Commit: f566d7b0a366720cd28b5f09f1ab978748baa968
Author: Campbell Barton
Date: Mon Jun 14 18:37:25 2021 +1000
Branches: override-recursive-resync
https://developer.blender.org/rBf566d7b0a366720cd28b5f09f1ab978748baa968
Nodes: remove redundant increment node tree current socket index
`ntree->cur_index` was being incremented twice in make_socket_interface.
Reviewed By: JacquesLucke
Ref D11590
===================================================================
M source/blender/blenkernel/intern/node.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/node.cc
b/source/blender/blenkernel/intern/node.cc
index f4e78859749..1c82218fc65 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -3342,8 +3342,6 @@ static bNodeSocket *make_socket_interface(bNodeTree
*ntree,
const char *name)
{
bNodeSocketType *stype = nodeSocketTypeFind(idname);
- int own_index = ntree->cur_index++;
-
if (stype == nullptr) {
return nullptr;
}
@@ -3355,7 +3353,7 @@ static bNodeSocket *make_socket_interface(bNodeTree
*ntree,
sock->type = SOCK_CUSTOM; /* int type undefined by default */
/* assign new unique index */
- own_index = ntree->cur_index++;
+ const int own_index = ntree->cur_index++;
/* use the own_index as socket identifier */
if (in_out == SOCK_IN) {
BLI_snprintf(sock->identifier, MAX_NAME, "Input_%d", own_index);
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
