blender
/
blender
134
424
Fork 606
Code Issues 6.4k Pull Requests 774 Projects 19 Wiki Activity

Cleanup: Don't do recursion where possible in node.cc #105394

Merged
Hans Goudey merged 25 commits from mod_moder/blender:cleanup_bke_nodes_unwrap_recursion into main 2023-03-06 18:39:30 +01:00
Conversation 1 Commits 25 Files Changed 1 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f38f25f4f4 - Show all commits

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

@ -678,7 +678,7 @@ struct bNode *nodeAddStaticNode(const struct bContext *C, struct bNodeTree *ntre
/** /**
* \note Goes over entire tree. * \note Goes over entire tree.
*/ */
void nodeUnlinkNode(struct bNodeTree *ntree, const struct bNode *node); void nodeUnlinkNode(struct bNodeTree *ntree, struct bNode *node);
/** /**
* Find the first available, non-duplicate name for a given node. * Find the first available, non-duplicate name for a given node.
*/ */

4
source/blender/blenkernel/intern/node.cc
View File

@ -2914,10 +2914,10 @@ void BKE_node_preview_merge_tree(bNodeTree *to_ntree, bNodeTree *from_ntree, boo
} }
} }
void nodeUnlinkNode(bNodeTree *ntree, const bNode *node) void nodeUnlinkNode(bNodeTree *ntree, bNode *node)
{ {
LISTBASE_FOREACH_MUTABLE (bNodeLink *, link, &ntree->links) { LISTBASE_FOREACH_MUTABLE (bNodeLink *, link, &ntree->links) {
ListBase const *lb = nullptr; ListBase *lb = nullptr;
if (link->fromnode == node) { if (link->fromnode == node) {
lb = &node->outputs; lb = &node->outputs;
} }