diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-22 15:33:26 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-22 15:34:19 +0300 |
| commit | 15a0ad602746bd8dd7dde3822d54979e72ca9de2 (patch) | |
| tree | 76a1dbcc538f79c9913923597ab33720acab3ee3 /source/blender/editors | |
| parent | 5d2b3a966eb2bce71c1effb4c79cf0f23c1d5bf5 (diff) | |
Fix multi layer/multi pass render
But introduced on the SceneRenderLayer > RenderLayer commit:
3a95bdfc65d883e7db006f
Reported by Sergey Sharybin (over irc).
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/render/render_internal.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 701227091b3..8119e88eeaa 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -308,9 +308,6 @@ static int screen_render_exec(bContext *C, wmOperator *op) /* custom scene and single layer re-render */ screen_render_scene_layer_set(op, mainp, &scene, &scene_layer); - if (scene_layer == NULL) { - scene_layer = CTX_data_scene_layer(C); - } if (!is_animation && is_write_still && BKE_imtype_is_movie(scene->r.im_format.imtype)) { BKE_report(op->reports, RPT_ERROR, "Cannot write a single file with an animation format selected"); @@ -914,9 +911,6 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even /* custom scene and single layer re-render */ screen_render_scene_layer_set(op, mainp, &scene, &scene_layer); - if (scene_layer == NULL) { - scene_layer = CTX_data_scene_layer(C); - } if (RNA_struct_property_is_set(op->ptr, "layer")) jobflag |= WM_JOB_SUSPEND; |