[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34387] trunk/blender/source/blender/ blenkernel/intern/node.c: Added a check in nodeGroupVerify to detect if a tree is actually a group tree .

Lukas Toenne lukas.toenne at googlemail.com
Tue Jan 18 14:28:19 CET 2011


Revision: 34387
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34387
Author:   lukastoenne
Date:     2011-01-18 13:28:18 +0000 (Tue, 18 Jan 2011)
Log Message:
-----------
Added a check in nodeGroupVerify to detect if a tree is actually a group tree. This is necessary to avoid the group-in-group error if the function is called for a tree that already contains group nodes.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/node.c

Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c	2011-01-18 11:27:52 UTC (rev 34386)
+++ trunk/blender/source/blender/blenkernel/intern/node.c	2011-01-18 13:28:18 UTC (rev 34387)
@@ -615,6 +615,12 @@
 /* should become callbackable... */
 void nodeVerifyGroup(bNodeTree *ngroup)
 {
+	/* XXX nodeVerifyGroup is sometimes called for non-group trees.
+	 * This is not the best way to check if a tree is a group,
+	 * trees should get their own flag for this!
+	 */
+	if (!ngroup->owntype)
+		return;
 	
 	/* group changed, so we rebuild the type definition */
 	ntreeMakeOwnType(ngroup);




More information about the Bf-blender-cvs mailing list