archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T65520: Assigning Material a second time crashes Blender

Browse Source
This commit is contained in:
Sergey Sharybin
2019-06-05 14:51:40 +02:00
parent a73b250fc5
commit 5f737cc18f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1468,8 +1468,6 @@ void BKE_node_tree_copy_data(Main *UNUSED(bmain),
}
}
BLI_ghash_free(new_pointers, NULL, NULL);
/* copy interface sockets */
BLI_duplicatelist(&ntree_dst->inputs, &ntree_src->inputs);
for (sock_dst = ntree_dst->inputs.first, sock_src = ntree_src->inputs.first; sock_dst != NULL;
@@ -1503,10 +1501,12 @@ void BKE_node_tree_copy_data(Main *UNUSED(bmain),
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;
node_dst->parent = BLI_ghash_lookup_default(new_pointers, node_dst->parent, NULL);
}
}
BLI_ghash_free(new_pointers, NULL, NULL);
/* node tree will generate its own interface type */
ntree_dst->interface_type = NULL;
}