Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-03-01 21:09:17 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-03-01 21:26:57 +0300
commit4c3be0bf52292add5cdf23be5f4affb76f1b747d (patch)
treed46575c078b755ac833c3ff587feab6d92182d59 /source/blender/nodes/composite
parent1f22e3f311e74031c3c01714117d759d3e3de3f1 (diff)
Fix T62073: Cycles random hangs rendering with Save Buffers on.
Diffstat (limited to 'source/blender/nodes/composite')
-rw-r--r--source/blender/nodes/composite/nodes/node_composite_image.c4
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 e22f685461b..4d0e63a7fdc 100644
--- a/source/blender/nodes/composite/nodes/node_composite_image.c
+++ b/source/blender/nodes/composite/nodes/node_composite_image.c
@@ -205,7 +205,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, SceneRenderLayer *srl,
+static void cmp_node_rlayer_create_outputs_cb(void *UNUSED(userdata), Scene *scene, SceneRenderLayer *srl,
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.
@@ -235,7 +235,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, srl, cmp_node_rlayer_create_outputs_cb);
+ RE_engine_update_render_passes(engine, scene, srl, cmp_node_rlayer_create_outputs_cb, NULL);
RE_engine_free(engine);
MEM_freeN(data);