From be2e41c397ba4d13b13e817bee46628ce984bd6b Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 9 Mar 2020 18:40:06 +0100 Subject: Cleanup: Move `BKE_animdata_free()` call out of each IDType free data. This has been long standing TODO... Note that remaining usages of BKE_xxx_delete should all be carefully checked for and utilmately nuked in favor of `BKE_id_delete()`, think we still have quiet a few bugs hidden in those (code seems to usually assume those functions do a full ID deletion, which is not the case). --- source/blender/blenkernel/intern/node.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source/blender/blenkernel/intern/node.c') diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index a2bd1296c2b..1feb20ec272 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -195,8 +195,6 @@ static void ntree_free_data(ID *id) bNode *node, *next; bNodeSocket *sock, *nextsock; - BKE_animdata_free((ID *)ntree, false); - /* XXX hack! node trees should not store execution graphs at all. * This should be removed when old tree types no longer require it. * Currently the execution data for texture nodes remains in the tree @@ -2156,6 +2154,7 @@ static void free_localized_node_groups(bNodeTree *ntree) void ntreeFreeTree(bNodeTree *ntree) { ntree_free_data(&ntree->id); + BKE_animdata_free(&ntree->id, false); } void ntreeFreeNestedTree(bNodeTree *ntree) -- cgit v1.2.3