diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2012-07-04 16:30:17 +0400 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2012-07-04 16:30:17 +0400 |
| commit | 7cde835c2e15d39692bd6715e8d3acaffe3a5c92 (patch) | |
| tree | 0a8b8695b309ba5be3e7f6963d2379234f4a0f65 /source/blender/nodes/composite/node_composite_tree.c | |
| parent | 4d2a6a8e21031702f1ca6fdd1130af73362dcb91 (diff) | |
relay the original node to a different place holder to resolve some
crashes.
Diffstat (limited to 'source/blender/nodes/composite/node_composite_tree.c')
| -rw-r--r-- | source/blender/nodes/composite/node_composite_tree.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/nodes/composite/node_composite_tree.c b/source/blender/nodes/composite/node_composite_tree.c index 58357bdd59d..b9acf821efe 100644 --- a/source/blender/nodes/composite/node_composite_tree.c +++ b/source/blender/nodes/composite/node_composite_tree.c @@ -132,6 +132,7 @@ static void localize(bNodeTree *localtree, bNodeTree *ntree) for (node= ntree->nodes.first; node; node= node->next) { /* ensure new user input gets handled ok */ node->need_exec= 0; + node->new_node->original = node; /* move over the compbufs */ /* right after ntreeCopyTree() oldsock pointers are valid */ @@ -191,8 +192,6 @@ static void local_sync(bNodeTree *localtree, bNodeTree *ntree) /* move over the compbufs and previews */ for (lnode= localtree->nodes.first; lnode; lnode= lnode->next) { - lnode->new_node->new_node = lnode; - lnode->highlight = 0; if ( (lnode->exec & NODE_READY) && !(lnode->exec & NODE_SKIPPED) ) { if (ntreeNodeExists(ntree, lnode->new_node)) { @@ -214,7 +213,6 @@ static void local_merge(bNodeTree *localtree, bNodeTree *ntree) /* move over the compbufs and previews */ for (lnode= localtree->nodes.first; lnode; lnode= lnode->next) { - lnode->highlight = 0; if (ntreeNodeExists(ntree, lnode->new_node)) { if (ELEM(lnode->type, CMP_NODE_VIEWER, CMP_NODE_SPLITVIEWER)) { if (lnode->id && (lnode->flag & NODE_DO_OUTPUT)) { |