diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-11 18:39:05 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-11 18:39:39 +0300 |
| commit | c31bc465eacd46725336792f120ad45a475e72bd (patch) | |
| tree | 8bcf352d169e7134af00246e547155e40ce57d33 /source/blender/blenkernel/intern/node.c | |
| parent | 7529690df38ced314d59af3b10c610e3fd56c807 (diff) | |
Revert previous commit and do proper fix for missing typeinfo in nodes.
Diffstat (limited to 'source/blender/blenkernel/intern/node.c')
| -rw-r--r-- | source/blender/blenkernel/intern/node.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 2031bb4e9d4..72a34d35715 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -1684,7 +1684,7 @@ static void node_free_node_ex(bNodeTree *ntree, bNode *node, bool remove_animdat remove_animdata &= ntree && !(ntree->flag & NTREE_IS_LOCALIZED); /* extra free callback */ - if (use_api_free_cb && node->typeinfo != NULL && node->typeinfo->freefunc_api) { + if (use_api_free_cb && node->typeinfo->freefunc_api) { PointerRNA ptr; RNA_pointer_create((ID *)ntree, &RNA_Node, node, &ptr); @@ -1711,7 +1711,7 @@ static void node_free_node_ex(bNodeTree *ntree, bNode *node, bool remove_animdat BKE_animdata_fix_paths_remove((ID *)ntree, prefix); } - if (node->typeinfo != NULL && ntree->typeinfo->free_node_cache) + if (ntree->typeinfo->free_node_cache) ntree->typeinfo->free_node_cache(ntree, node); /* texture node has bad habit of keeping exec data around */ @@ -1721,7 +1721,7 @@ static void node_free_node_ex(bNodeTree *ntree, bNode *node, bool remove_animdat } } - if (node->typeinfo != NULL && node->typeinfo->freefunc) { + if (node->typeinfo->freefunc) { node->typeinfo->freefunc(node); } |