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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2017-11-02 17:05:57 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2017-11-02 17:23:55 +0300
commit50c129760d0a32802a8b83a1d977a80c42210c00 (patch)
tree8960f019bf885233499af8b92e5b5d5e8a4598ab /source/blender/render
parent25f2abf314d02df0896e7678a31434d7b895b3d9 (diff)
Fix Cycles showing empty tiles while they are being denoised.
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/external_engine.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c
index b1cd23d0827..8764abf9674 100644
--- a/source/blender/render/intern/source/external_engine.c
+++ b/source/blender/render/intern/source/external_engine.c
@@ -273,7 +273,7 @@ void RE_engine_end_result(RenderEngine *engine, RenderResult *result, int cancel
RenderPart *pa = get_part_from_result(re, result);
if (pa) {
- pa->status = (merge_results)? PART_STATUS_MERGED: PART_STATUS_RENDERED;
+ pa->status = (!cancel && merge_results)? PART_STATUS_MERGED: PART_STATUS_RENDERED;
}
else if (re->result->do_exr_tile) {
/* if written result does not match any tile and we are using save