copy animdata and id-props when copying material node tree's to avoid double memory frees or node trees sharing animdata when they shouldnt.

This commit is contained in:
Campbell Barton
2010-02-15 08:50:04 +00:00
parent 12cd5617ea
commit 83fd3fbb43
3 changed files with 18 additions and 7 deletions

View File

@@ -1105,10 +1105,12 @@ bNodeTree *ntreeCopyTree(bNodeTree *ntree, int internal_select)
/* is ntree part of library? */
for(newtree=G.main->nodetree.first; newtree; newtree= newtree->id.next)
if(newtree==ntree) break;
if(newtree)
if(newtree) {
newtree= copy_libblock(ntree);
else
} else {
newtree= MEM_dupallocN(ntree);
copy_libblock_data(&newtree->id, &ntree->id); /* copy animdata and ID props */
}
newtree->nodes.first= newtree->nodes.last= NULL;
newtree->links.first= newtree->links.last= NULL;
}