Commit: 03a02cd109c326e4998745520deca8db4837e27d
Author: Bastien Montagne
Date: Mon Aug 14 15:40:11 2017 +0200
Branches: master
https://developer.blender.org/rB03a02cd109c326e4998745520deca8db4837e27d
Cleanup: confusing naming in BKE_node_tree_copy_data().
===================================================================
M source/blender/blenkernel/intern/node.c
===================================================================
diff --git a/source/blender/blenkernel/intern/node.c
b/source/blender/blenkernel/intern/node.c
index 37fc434141f..3836d154a7b 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -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;
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
