diff options
author | Jacques Lucke <jacques@blender.org> | 2022-11-11 13:49:54 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2022-11-11 13:49:54 +0300 |
commit | a3877d8fe4094c0502acdacfd15880da10260769 (patch) | |
tree | 3db721e3e0e5af15ffc13f083aebf537556fb085 /source/blender/makesrna | |
parent | 824d5984aab497e2914e99561f7f0a4bdafa4055 (diff) | |
parent | 57dd1b7799e7453e34c3a503333d0eadfa87af17 (diff) |
Merge branch 'blender-v3.4-release'
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 14122ddb878..c6115711c1a 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -1302,8 +1302,8 @@ static bNodeLink *rna_NodeTree_link_new(bNodeTree *ntree, return NULL; } - nodeFindNode(ntree, fromsock, &fromnode, NULL); - nodeFindNode(ntree, tosock, &tonode, NULL); + nodeFindNodeTry(ntree, fromsock, &fromnode, NULL); + nodeFindNodeTry(ntree, tosock, &tonode, NULL); /* check validity of the sockets: * if sockets from different trees are passed in this will fail! */ @@ -2789,9 +2789,7 @@ static char *rna_NodeSocket_path(const PointerRNA *ptr) int socketindex; char name_esc[sizeof(node->name) * 2]; - if (!nodeFindNode(ntree, sock, &node, &socketindex)) { - return NULL; - } + nodeFindNode(ntree, sock, &node, &socketindex); BLI_str_escape(name_esc, node->name, sizeof(name_esc)); |