[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56597] trunk/blender/source/blender/ makesrna/intern/rna_nodetree.c: Fix for node group user count: since node group pointer uses an explicit setter callback it has to do user count increment /decrement manually.

Lukas Toenne lukas.toenne at googlemail.com
Wed May 8 18:00:09 CEST 2013


Revision: 56597
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56597
Author:   lukastoenne
Date:     2013-05-08 16:00:08 +0000 (Wed, 08 May 2013)
Log Message:
-----------
Fix for node group user count: since node group pointer uses an explicit setter callback it has to do user count increment/decrement manually.

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_nodetree.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2013-05-08 15:41:09 UTC (rev 56596)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2013-05-08 16:00:08 UTC (rev 56597)
@@ -193,6 +193,7 @@
 
 #include "BKE_context.h"
 #include "BKE_idprop.h"
+#include "BKE_library.h"
 
 #include "BKE_global.h"
 
@@ -2370,8 +2371,14 @@
 	bNode *node = ptr->data;
 	bNodeTree *ngroup = value.data;
 	
-	if (nodeGroupPoll(ntree, ngroup))
+	if (nodeGroupPoll(ntree, ngroup)) {
+		if (node->id)
+			id_us_min(node->id);
+		if (ngroup)
+			id_us_plus(&ngroup->id);
+		
 		node->id = &ngroup->id;
+	}
 }
 
 static int rna_NodeGroup_node_tree_poll(PointerRNA *ptr, const PointerRNA value)




More information about the Bf-blender-cvs mailing list