kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

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.

Browse Source
This commit is contained in:
Lukas Toenne 2011-01-18 13:28:18 +00:00
parent 08dc18fda0
commit bee3d78393
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/node.c
View File

@ -615,6 +615,12 @@ bNode *nodeMakeGroupFromSelected(bNodeTree *ntree)
/* should become callbackable... */ /* should become callbackable... */
void nodeVerifyGroup(bNodeTree *ngroup) 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 */ /* group changed, so we rebuild the type definition */
ntreeMakeOwnType(ngroup); ntreeMakeOwnType(ngroup);