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:
authorRichard Antalik <richardantalik@gmail.com>2020-05-10 09:05:03 +0300
committerRichard Antalik <richardantalik@gmail.com>2020-05-10 09:05:03 +0300
commit78296366df27c9c957596ea73fad98c322f40d45 (patch)
treea2bf5609684be802231c3447c99e9e3026b21c2f /source/blender/editors/render
parent76e56e2ba70f4535da70b3e55d4b18ac3cd19820 (diff)
parenta1b3effd55f775643e99b17865e36c506e9bdc90 (diff)
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/editors/render')
-rw-r--r--source/blender/editors/render/render_internal.c6
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));