[Bf-blender-cvs] [9edff9ce9b5] blender2.8: Remove legacy node tree localization tag

[Sergey Sharybin]

Commit: 9edff9ce9b5c87c7b35d47d2e1fbbd957d391f3e
Author: Sergey Sharybin
Date:   Thu Nov 15 16:35:28 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB9edff9ce9b5c87c7b35d47d2e1fbbd957d391f3e

Remove legacy node tree localization tag

Is stored on ID level now.

===================================================================

M	source/blender/blenkernel/intern/node.c
M	source/blender/makesdna/DNA_node_types.h

===================================================================

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) {
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index 832002d63ee..a776fbbc3a6 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -419,7 +419,8 @@ typedef struct bNodeTree {
 #define NTREE_TWO_PASS				4	/* two pass */
 #define NTREE_COM_GROUPNODE_BUFFER	8	/* use groupnode buffers */
 #define NTREE_VIEWER_BORDER			16	/* use a border for viewer nodes */
-#define NTREE_IS_LOCALIZED			32	/* tree is localized copy, free when deleting node groups */
+/* NOTE: DEPRECATED, use (id->tag & LIB_TAG_LOCALIZED) instead. */
+/*#define NTREE_IS_LOCALIZED			32*/	/* tree is localized copy, free when deleting node groups */
 
 /* XXX not nice, but needed as a temporary flags
  * for group updates after library linking.