diff options
| author | Daniel Stokes <kupomail@gmail.com> | 2012-04-29 04:33:24 +0400 |
|---|---|---|
| committer | Daniel Stokes <kupomail@gmail.com> | 2012-04-29 04:33:24 +0400 |
| commit | afb8fffb1827a4fffc8e6b3d620a02f59b62e3a9 (patch) | |
| tree | 328e3c204210d68392805f371ef4d296175b6b6e /source/blender/nodes/composite/nodes/node_composite_image.c | |
| parent | f306b50700b05707f44b5472ac0b38d58fb01b0d (diff) | |
| parent | 72ec4c813a2c544341d0c4ae83369cea60e52c9e (diff) | |
Merged revisions 45967-46052 from trunk/blendersoc-2011-cucumber
Diffstat (limited to 'source/blender/nodes/composite/nodes/node_composite_image.c')
| -rw-r--r-- | source/blender/nodes/composite/nodes/node_composite_image.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/nodes/composite/nodes/node_composite_image.c b/source/blender/nodes/composite/nodes/node_composite_image.c index 6a156c390a7..62179cfa471 100644 --- a/source/blender/nodes/composite/nodes/node_composite_image.c +++ b/source/blender/nodes/composite/nodes/node_composite_image.c @@ -442,11 +442,14 @@ static void node_composit_exec_image(void *data, bNode *node, bNodeStack **UNUSE /* preview policy: take first 'Combined' pass if available, * otherwise just use the first layer. */ - if (!firstbuf) + if (!firstbuf) { firstbuf = stackbuf; + } if (!combinedbuf && - (strcmp(sock->name, "Combined")==0 || strcmp(sock->name, "Image")==0)) + (strcmp(sock->name, "Combined") == 0 || strcmp(sock->name, "Image") == 0)) + { combinedbuf = stackbuf; + } } } } |