Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: confusing naming in BKE_node_tree_copy_data().

Browse Source
This commit is contained in:
Bastien Montagne
2017-08-14 15:40:11 +02:00
parent 04f034abad
commit 03a02cd109
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/blenkernel/intern/node.c
View File

@@ -1221,7 +1221,6 @@ bNodeTree *ntreeAddTree(Main *bmain, const char *name, const char *idname)
*/
void BKE_node_tree_copy_data(Main *UNUSED(bmain), bNodeTree *ntree_dst, const bNodeTree *ntree_src, const int flag)
{
bNode *node_src;
bNodeSocket *sock_dst, *sock_src;
bNodeLink *link_dst;
@@ -1236,7 +1235,7 @@ void BKE_node_tree_copy_data(Main *UNUSED(bmain), bNodeTree *ntree_dst, const bN
BLI_listbase_clear(&ntree_dst->nodes);
BLI_listbase_clear(&ntree_dst->links);
for (node_src = ntree_src->nodes.first; node_src; node_src = node_src->next) {
for (bNode *node_src = ntree_src->nodes.first; node_src; node_src = node_src->next) {
BKE_node_copy_ex(ntree_dst, node_src, flag_subdata);
}
@@ -1287,9 +1286,9 @@ void BKE_node_tree_copy_data(Main *UNUSED(bmain), bNodeTree *ntree_dst, const bN
}
/* update node->parent pointers */
for (node_src = ntree_dst->nodes.first; node_src; node_src = node_src->next) {
if (node_src->parent) {
node_src->parent = node_src->parent->new_node;
for (bNode *node_dst = ntree_dst->nodes.first, *node_src = ntree_src->nodes.first; node_dst; node_dst = node_dst->next, node_src = node_src->next) {
if (node_dst->parent) {
node_dst->parent = node_dst->parent->new_node;
}
}