diff options
author | Richard Antalik <richardantalik@gmail.com> | 2020-05-10 08:50:09 +0300 |
---|---|---|
committer | Richard Antalik <richardantalik@gmail.com> | 2020-05-10 08:51:20 +0300 |
commit | a1b3effd55f775643e99b17865e36c506e9bdc90 (patch) | |
tree | 10e689c0d2303ce4d4b37b8d632082f471ee56d8 /source/blender/editors/render | |
parent | ce76e17584eea6185170275250b25d9f5b80ad12 (diff) |
Fix T71300: Crash on rendering scene recursively from sequencer
Adding recursive scenes has been disabled, but old files still can be opened.
Add check if scene will render itself.
Opening such file will produce warning on open and error on running render.
Reviewed By: campbellbarton
Differential Revision: https://developer.blender.org/D7562
Diffstat (limited to 'source/blender/editors/render')
-rw-r--r-- | source/blender/editors/render/render_internal.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 1237c2c2eda..17049fdb28b 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -945,6 +945,12 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even return OPERATOR_CANCELLED; } + /* Reports are done inside check function, and it will return false if there are other strips to + * render. */ + if ((scene->r.scemode & R_DOSEQ) && BKE_sequencer_check_scene_recursion(scene, op->reports)) { + return OPERATOR_CANCELLED; + } + /* stop all running jobs, except screen one. currently previews frustrate Render */ WM_jobs_kill_all_except(CTX_wm_manager(C), CTX_wm_screen(C)); |