diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-06-09 00:21:38 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-06-09 00:21:43 +0300 |
| commit | 346619159ae39dfb4063f563d498eec32bba13aa (patch) | |
| tree | e99bc984bfc7ab1d472981722f413481ebc97360 /source/blender/nodes | |
| parent | 836c3c14cc8c8f882887c9ec95f1740e14893dc4 (diff) | |
| parent | 8a757bf34ad2d01104e300e0ce529d01f2965e09 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/composite/nodes/node_composite_image.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/nodes/composite/nodes/node_composite_image.c b/source/blender/nodes/composite/nodes/node_composite_image.c index a95a99449fd..8139e29bade 100644 --- a/source/blender/nodes/composite/nodes/node_composite_image.c +++ b/source/blender/nodes/composite/nodes/node_composite_image.c @@ -117,7 +117,7 @@ static void cmp_node_image_add_pass_output(bNodeTree *ntree, bNode *node, else { sock = BLI_findlink(&node->outputs, sock_index); NodeImageLayer *sockdata = sock->storage; - if(sockdata) { + if (sockdata) { BLI_strncpy(sockdata->pass_name, passname, sizeof(sockdata->pass_name)); } } |