archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

relay the original node to a different place holder to resolve some

Browse Source 
crashes.
This commit is contained in:
Jeroen Bakker
2012-07-04 12:30:17 +00:00
parent 4d2a6a8e21
commit 7cde835c2e
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/nodes/composite/node_composite_tree.c
View File

@@ -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)) {