[Bf-blender-cvs] [741fa8180c4] master: Fix T91679: Crash when saving bordered render as multilayer exr

Sergey Sharybin noreply at git.blender.org
Tue Sep 28 10:49:09 CEST 2021


Commit: 741fa8180c4fbe98f3cc8b3eee239b03e26309f4
Author: Sergey Sharybin
Date:   Tue Sep 28 10:47:39 2021 +0200
Branches: master
https://developer.blender.org/rB741fa8180c4fbe98f3cc8b3eee239b03e26309f4

Fix T91679: Crash when saving bordered render as multilayer exr

The related issue which is fixed by this change is the missing noisy
image pass when denoising and border render is used,

Need to allocate passes after the passes has been copied from the
original render result.

===================================================================

M	source/blender/render/intern/pipeline.c

===================================================================

diff --git a/source/blender/render/intern/pipeline.c b/source/blender/render/intern/pipeline.c
index 72ff920561d..931282e26dd 100644
--- a/source/blender/render/intern/pipeline.c
+++ b/source/blender/render/intern/pipeline.c
@@ -1015,10 +1015,10 @@ static void render_result_uncrop(Render *re)
       render_result_disprect_to_full_resolution(re);
 
       rres = render_result_new(re, &re->disprect, RR_ALL_LAYERS, RR_ALL_VIEWS);
-      render_result_passes_allocated_ensure(rres);
       rres->stamp_data = BKE_stamp_data_copy(re->result->stamp_data);
 
       render_result_clone_passes(re, rres, NULL);
+      render_result_passes_allocated_ensure(rres);
 
       render_result_merge(rres, re->result);
       render_result_free(re->result);



More information about the Bf-blender-cvs mailing list