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

Fix #34115, Group Node corrupted by frames.

Browse Source 
The group node operators offset nodes when moving them between node trees, but this should only be done for "free", un-parented nodes not attached to a frame, otherwise the node loc is relative to the parent node.
This commit is contained in:
Lukas Toenne 2013-02-06 13:59:54 +00:00
parent 12ef1b63e2
commit 8b1fb0fd2a
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/editors/space_node/node_group.c
View File

@ -457,8 +457,10 @@ static int node_group_ungroup(bNodeTree *ntree, bNode *gnode)
/* ensure unique node name in the nodee tree */ /* ensure unique node name in the nodee tree */
nodeUniqueName(ntree, node); nodeUniqueName(ntree, node);
node->locx += gnode->locx; if (!node->parent) {
node->locy += gnode->locy; node->locx += gnode->locx;
node->locy += gnode->locy;
}
node->flag |= NODE_SELECT; node->flag |= NODE_SELECT;
} }
@ -673,8 +675,10 @@ static int node_group_separate_selected(bNodeTree *ntree, bNode *gnode, int make
/* ensure unique node name in the node tree */ /* ensure unique node name in the node tree */
nodeUniqueName(ntree, newnode); nodeUniqueName(ntree, newnode);
newnode->locx += gnode->locx; if (!newnode->parent) {
newnode->locy += gnode->locy; newnode->locx += gnode->locx;
newnode->locy += gnode->locy;
}
} }
else { else {
/* ensure valid parent pointers, detach if child stays inside the group */ /* ensure valid parent pointers, detach if child stays inside the group */
@ -865,12 +869,14 @@ static int node_group_make_test(bNodeTree *ntree, bNode *gnode)
static void node_get_selected_minmax(bNodeTree *ntree, bNode *gnode, float *min, float *max) static void node_get_selected_minmax(bNodeTree *ntree, bNode *gnode, float *min, float *max)
{ {
bNode *node; bNode *node;
float loc[2];
INIT_MINMAX2(min, max); INIT_MINMAX2(min, max);
for (node = ntree->nodes.first; node; node = node->next) { for (node = ntree->nodes.first; node; node = node->next) {
if (node == gnode) if (node == gnode)
continue; continue;
if (node->flag & NODE_SELECT) { if (node->flag & NODE_SELECT) {
minmax_v2v2_v2(min, max, &node->locx); nodeToView(node, 0.0f, 0.0f, &loc[0], &loc[1]);
minmax_v2v2_v2(min, max, loc);
} }
} }
} }
@ -921,8 +927,10 @@ static int node_group_make_insert_selected(bNodeTree *ntree, bNode *gnode)
/* ensure unique node name in the ngroup */ /* ensure unique node name in the ngroup */
nodeUniqueName(ngroup, node); nodeUniqueName(ngroup, node);
node->locx -= 0.5f * (min[0] + max[0]); if (!node->parent) {
node->locy -= 0.5f * (min[1] + max[1]); node->locx -= 0.5f * (min[0] + max[0]);
node->locy -= 0.5f * (min[1] + max[1]);
}
} }
else { else {
/* if the parent is to be inserted but not the child, detach properly */ /* if the parent is to be inserted but not the child, detach properly */