Revision: 47746
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47746
Author: lukastoenne
Date: 2012-06-11 15:28:45 +0000 (Mon, 11 Jun 2012)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/source/blender/nodes/intern/node_common.c
Modified: trunk/blender/source/blender/nodes/intern/node_common.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/node_common.c 2012-06-11
15:19:12 UTC (rev 47745)
+++ trunk/blender/source/blender/nodes/intern/node_common.c 2012-06-11
15:28:45 UTC (rev 47746)
@@ -176,6 +176,10 @@
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);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
