diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-02-26 17:56:27 +0400 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2014-02-26 17:56:27 +0400 |
commit | 4cfca0adfeeadccf0013aaeb8b34315b2d2a8e33 (patch) | |
tree | ebdcdf3247b8d5280f3a376ae92113962a1e1971 /source/blender/editors | |
parent | ecbae4ab466e9d50b11fd434caf29ea1781fa7d6 (diff) |
Nicer solution to T38846: Split off the render layer forcing from the
validity check for render operator.
This way scene DNA can stay read-only there, cleaner and we don't have
to pass an awkward bool pointer around.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/render/render_internal.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index c922389f3cc..a842135ce72 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -799,17 +799,17 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even struct Object *camera_override = v3d ? V3D_CAMERA_LOCAL(v3d) : NULL; const char *name; ScrArea *sa; - bool scene_rlayer_update; /* only one render job at a time */ if (WM_jobs_test(CTX_wm_manager(C), scene, WM_JOB_TYPE_RENDER)) return OPERATOR_CANCELLED; - if (!RE_is_rendering_allowed(scene, camera_override, op->reports, &scene_rlayer_update)) { + if (RE_force_single_renderlayer(scene)) + WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, NULL); + + if (!RE_is_rendering_allowed(scene, camera_override, op->reports)) { return OPERATOR_CANCELLED; } - if (scene_rlayer_update) - WM_event_add_notifier(C, NC_SCENE | ND_RENDER_OPTIONS, NULL); 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"); |