From edecf49d8408f565963ed03bc795b7eff712ac5d Mon Sep 17 00:00:00 2001 From: Lukas Toenne Date: Mon, 11 Jun 2012 15:28:45 +0000 Subject: Fix for node 'make group' operator in combination with frame nodes. When a selected node is attached to an unselected frame, the parent pointer would end up pointing to a different ID data block. --- source/blender/nodes/intern/node_common.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source/blender/nodes/intern') diff --git a/source/blender/nodes/intern/node_common.c b/source/blender/nodes/intern/node_common.c index 3d1b656fc4e..78d21e5d4e4 100644 --- a/source/blender/nodes/intern/node_common.c +++ b/source/blender/nodes/intern/node_common.c @@ -176,6 +176,10 @@ bNode *node_group_make_from_selected(bNodeTree *ntree) BLI_addtail(&anim_basepaths, BLI_genericNodeN(path)); } + /* ensure valid parent pointers, detach if parent stays outside the group */ + if (node->parent && !(node->parent->flag & NODE_SELECT)) + nodeDetachNode(node); + /* change node-collection membership */ BLI_remlink(&ntree->nodes, node); BLI_addtail(&ngroup->nodes, node); -- cgit v1.2.3