[Bf-blender-cvs] [f19ec36bcf6] cycles-x: Merge branch 'master' into cycles-x

[Sergey Sharybin]

Commit: f19ec36bcf65ac324e1f350047850776c9270826
Author: Sergey Sharybin
Date:   Tue Aug 31 12:16:19 2021 +0200
Branches: cycles-x
https://developer.blender.org/rBf19ec36bcf65ac324e1f350047850776c9270826

Merge branch 'master' into cycles-x

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



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

diff --cc source/blender/render/intern/pipeline.c
index e43c4743d17,5418f4035b1..36b1fce651c
--- a/source/blender/render/intern/pipeline.c
+++ b/source/blender/render/intern/pipeline.c
@@@ -1012,7 -1040,8 +1012,8 @@@ static void render_result_uncrop(Rende
        /* weak is: it chances disprect from border */
        render_result_disprect_to_full_resolution(re);
  
 -      rres = render_result_new(re, &re->disprect, RR_USE_MEM, RR_ALL_LAYERS, RR_ALL_VIEWS);
 +      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);