diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-15 18:35:28 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-15 18:35:28 +0300 |
| commit | 9edff9ce9b5c87c7b35d47d2e1fbbd957d391f3e (patch) | |
| tree | 81a328e7f9d3983827031b5a6ecf4b6a8906349e /source/blender/blenkernel/intern/node.c | |
| parent | c5219abd74f7d9721987aa50600353f134e25d08 (diff) | |
Remove legacy node tree localization tag
Is stored on ID level now.
Diffstat (limited to 'source/blender/blenkernel/intern/node.c')
| -rw-r--r-- | source/blender/blenkernel/intern/node.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 869e2849be5..14ca2b8562a 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -1695,7 +1695,7 @@ static void node_free_node_ex(bNodeTree *ntree, bNode *node, bool remove_animdat /* don't remove node animdata if the tree is localized, * Action is shared with the original tree (T38221) */ - remove_animdata &= ntree && !(ntree->flag & NTREE_IS_LOCALIZED); + remove_animdata &= ntree && !(ntree->id.tag & LIB_TAG_LOCALIZED); /* extra free callback */ if (use_api_free_cb && node->typeinfo->freefunc_api) { @@ -1788,7 +1788,7 @@ static void free_localized_node_groups(bNodeTree *ntree) * since it is a localized copy itself (no risk of accessing free'd * data in main, see [#37939]). */ - if (!(ntree->flag & NTREE_IS_LOCALIZED)) + if (!(ntree->id.tag & LIB_TAG_LOCALIZED)) return; for (node = ntree->nodes.first; node; node = node->next) { @@ -2018,7 +2018,6 @@ bNodeTree *ntreeLocalize(bNodeTree *ntree) LIB_ID_COPY_NO_PREVIEW | LIB_ID_COPY_NO_ANIMDATA), false); - ltree->flag |= NTREE_IS_LOCALIZED; for (node = ltree->nodes.first; node; node = node->next) { if (node->type == NODE_GROUP && node->id) { |