diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-01 21:29:26 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-01 21:29:26 +0300 |
commit | a577499c7521c5fcfaefd58ec1d8940886563adc (patch) | |
tree | 99282a1d920bd693933efeac4d69a6807bd0e974 /source/blender/nodes | |
parent | d16386e50bc104f9446a30e041a7b74f38b51ae9 (diff) | |
parent | 4c3be0bf52292add5cdf23be5f4affb76f1b747d (diff) |
Merge branch 'blender2.7'
Diffstat (limited to 'source/blender/nodes')
-rw-r--r-- | source/blender/nodes/composite/nodes/node_composite_image.c | 4 |
1 files changed, 2 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 870cb5554a0..8c0a277668f 100644 --- a/source/blender/nodes/composite/nodes/node_composite_image.c +++ b/source/blender/nodes/composite/nodes/node_composite_image.c @@ -206,7 +206,7 @@ void node_cmp_rlayers_register_pass(bNodeTree *ntree, bNode *node, Scene *scene, } } -static void cmp_node_rlayer_create_outputs_cb(RenderEngine *UNUSED(engine), Scene *scene, ViewLayer *view_layer, +static void cmp_node_rlayer_create_outputs_cb(void *UNUSED(userdata), Scene *scene, ViewLayer *view_layer, const char *name, int UNUSED(channels), const char *UNUSED(chanid), int type) { /* Register the pass in all scenes that have a render layer node for this layer. @@ -238,7 +238,7 @@ static void cmp_node_rlayer_create_outputs(bNodeTree *ntree, bNode *node, LinkNo node->storage = data; RenderEngine *engine = RE_engine_create(engine_type); - RE_engine_update_render_passes(engine, scene, view_layer, cmp_node_rlayer_create_outputs_cb); + RE_engine_update_render_passes(engine, scene, view_layer, cmp_node_rlayer_create_outputs_cb, NULL); RE_engine_free(engine); MEM_freeN(data); |