griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix for node clipboard copy operator for Frame nodes. Was redirecting the parent pointer of the original instead of the copied nodes.

Browse Source
This commit is contained in:
Lukas Toenne
2012-08-03 10:18:52 +00:00
parent 52e31a4866
commit c12d0fd76c
1 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
source/blender/editors/space_node/node_edit.c
View File

@@ -1919,6 +1919,22 @@ static int node_clipboard_copy_exec(bContext *C, wmOperator *UNUSED(op))
}
}
/* ensure valid pointers */
for (node = ntree->nodes.first; node; node = node->next) {
if (node->flag & SELECT) {
bNode *new_node = node->new_node;
if (new_node->parent) {
/* parent pointer must be redirected to new node or detached if parent is not copied */
if (new_node->parent->flag & NODE_SELECT) {
new_node->parent = new_node->parent->new_node;
}
else {
nodeDetachNode(new_node);
}
}
}
}
/* copy links between selected nodes
* NB: this depends on correct node->new_node and sock->new_sock pointers from above copy!
*/
@@ -1938,16 +1954,6 @@ static int node_clipboard_copy_exec(bContext *C, wmOperator *UNUSED(op))
}
}
/* reparent copied nodes */
for (node = ntree->nodes.first; node; node = node->next) {
if ((node->flag & SELECT) && node->parent) {
if (node->parent->flag & SELECT)
node->parent = node->parent->new_node;
else
node->parent = NULL;
}
}
return OPERATOR_FINISHED;
}
@@ -1995,14 +2001,21 @@ static int node_clipboard_paste_exec(bContext *C, wmOperator *UNUSED(op))
/* copy nodes from clipboard */
for (node = nodeClipboardGetNodes()->first; node; node = node->next) {
bNode *newnode = nodeCopyNode(ntree, node);
bNode *new_node = nodeCopyNode(ntree, node);
/* pasted nodes are selected */
node_select(newnode);
node_select(new_node);
/* place nodes around the mouse cursor */
newnode->locx += snode->mx - centerx;
newnode->locy += snode->my - centery;
new_node->locx += snode->mx - centerx;
new_node->locy += snode->my - centery;
}
/* reparent copied nodes */
for (node = nodeClipboardGetNodes()->first; node; node = node->next) {
bNode *new_node = node->new_node;
if (new_node->parent)
new_node->parent = new_node->parent->new_node;
}
for (link = nodeClipboardGetLinks()->first; link; link = link->next) {
@@ -2010,12 +2023,6 @@ static int node_clipboard_paste_exec(bContext *C, wmOperator *UNUSED(op))
link->tonode->new_node, link->tosock->new_sock);
}
/* reparent copied nodes */
for (node = nodeClipboardGetNodes()->first; node; node = node->next) {
if (node->new_node->parent)
node->new_node->parent = node->new_node->parent->new_node;
}
ntreeUpdateTree(snode->edittree);
snode_notify(C, snode);