Fix ID user counting issues with NodeCustomGroup.

User counting now happens before init() and after free() methods, so that
the ID users are in a valid state when Python might modify them. ID user
counting was moved into node.c and simplified.

Patch by Miguel with further refactoring by Brecht. Ref D4370.

1 files changed, 2 insertions, 9 deletions

diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index b1cada9752a..1a18e886808 100644
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -1590,11 +1590,8 @@ static int node_delete_exec(bContext *C, wmOperator *UNUSED(op))
 	for (node = snode->edittree->nodes.first; node; node = next) {
 		next = node->next;
 		if (node->flag & SELECT) {
-			/* check id user here, nodeFreeNode is called for free dbase too */
 			do_tag_update |= (do_tag_update || node_connected_to_output(bmain, snode->edittree, node));
-			if (node->id)
-				id_us_min(node->id);
-			nodeDeleteNode(bmain, snode->edittree, node);
+			nodeRemoveNode(bmain, snode->edittree, node, true);
 		}
 	}
 
@@ -1684,11 +1681,7 @@ static int node_delete_reconnect_exec(bContext *C, wmOperator *UNUSED(op))
 		next = node->next;
 		if (node->flag & SELECT) {
 			nodeInternalRelink(snode->edittree, node);
-
-			/* check id user here, nodeFreeNode is called for free dbase too */
-			if (node->id)
-				id_us_min(node->id);
-			nodeDeleteNode(bmain, snode->edittree, node);
+			nodeRemoveNode(bmain, snode->edittree, node, true);
 		}
 	}