diff options
| author | Ton Roosendaal <ton@blender.org> | 2009-02-25 12:54:41 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2009-02-25 12:54:41 +0300 |
| commit | fc070ca31c753111899f11801c85e82e5f23a607 (patch) | |
| tree | a71c3331e08771d2e44493be7d3f9e7a3ea54efe /source/blender/blenkernel/intern/node.c | |
| parent | 669dd229f467b6f28efb7b2f11e727c5293740c0 (diff) | |
2.5
Bugfix in compositor: code that duplicated the nodetree and merged
viewer images back lacked handling the case when a viewer was not
set active yet.
This fixes eternal loops in compositor after removing Viewers.
Diffstat (limited to 'source/blender/blenkernel/intern/node.c')
| -rw-r--r-- | source/blender/blenkernel/intern/node.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 89d00cc8f06..1e0abac915b 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -2490,8 +2490,11 @@ bNodeTree *ntreeLocalize(bNodeTree *ntree) node->need_exec= 0; if(ELEM(node->type, CMP_NODE_VIEWER, CMP_NODE_SPLITVIEWER)) { - if(node->id && (node->flag & NODE_DO_OUTPUT)) { - node->new_node->id= (ID *)BKE_image_copy((Image *)node->id); + if(node->id) { + if(node->flag & NODE_DO_OUTPUT) + node->new_node->id= (ID *)BKE_image_copy((Image *)node->id); + else + node->new_node->id= NULL; } } @@ -2565,6 +2568,7 @@ void ntreeLocalMerge(bNodeTree *localtree, bNodeTree *ntree) if(ELEM(lnode->type, CMP_NODE_VIEWER, CMP_NODE_SPLITVIEWER)) { if(lnode->id && (lnode->flag & NODE_DO_OUTPUT)) { + /* image_merge does sanity check for pointers */ BKE_image_merge((Image *)lnode->new_node->id, (Image *)lnode->id); } } |