[Bf-blender-cvs] [013d181dca4] studio-sprite-fright: Fix T91679: Crash when saving bordered render as multilayer exr

Bastien Montagne noreply at git.blender.org
Tue Sep 28 11:58:03 CEST 2021


Commit: 013d181dca4324b77d63af012087ba1675cb3036
Author: Bastien Montagne
Date:   Tue Sep 28 11:55:22 2021 +0200
Branches: studio-sprite-fright
https://developer.blender.org/rB013d181dca4324b77d63af012087ba1675cb3036

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.

This is a manual cherry-pick of rB741fa8180c4f.

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

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

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

diff --git a/source/blender/render/intern/pipeline.c b/source/blender/render/intern/pipeline.c
index 5418f4035b1..287d7203ae0 100644
--- a/source/blender/render/intern/pipeline.c
+++ b/source/blender/render/intern/pipeline.c
@@ -1041,10 +1041,10 @@ static void render_result_uncrop(Render *re)
       render_result_disprect_to_full_resolution(re);
 
       rres = render_result_new(re, &re->disprect, RR_USE_MEM, 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