blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 745 Projects 19 Wiki Activity

Fix multi layer/multi pass render 

But introduced on the SceneRenderLayer > RenderLayer commit:
3a95bdfc65

Reported by Sergey Sharybin (over irc).
This commit is contained in:
Dalai Felinto 2017-11-22 10:33:26 -02:00
parent 5d2b3a966e
commit 15a0ad6027
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/render/render_internal.c
View File

@ -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;