[Bf-blender-cvs] [1f691050e5e] blender-v2.92-release: Fix T84539: cryptomatte metadata lost when using save buffers option

[Brecht Van Lommel]

Commit: 1f691050e5eb1b59676d6540e712357086d2218c
Author: Brecht Van Lommel
Date:   Wed Jan 20 13:27:27 2021 +0100
Branches: blender-v2.92-release
https://developer.blender.org/rB1f691050e5eb1b59676d6540e712357086d2218c

Fix T84539: cryptomatte metadata lost when using save buffers option

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

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

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

diff --git a/source/blender/render/intern/render_result.c b/source/blender/render/intern/render_result.c
index 1ed894751ce..f135adc9f05 100644
--- a/source/blender/render/intern/render_result.c
+++ b/source/blender/render/intern/render_result.c
@@ -1229,6 +1229,10 @@ void render_result_exr_file_begin(Render *re, RenderEngine *engine)
 /* end write of exr tile file, read back first sample */
 void render_result_exr_file_end(Render *re, RenderEngine *engine)
 {
+  /* Preserve stamp data. */
+  struct StampData *stamp_data = re->result->stamp_data;
+  re->result->stamp_data = NULL;
+
   /* Close EXR files. */
   for (RenderResult *rr = re->result; rr; rr = rr->next) {
     LISTBASE_FOREACH (RenderLayer *, rl, &rr->layers) {
@@ -1243,6 +1247,7 @@ void render_result_exr_file_end(Render *re, RenderEngine *engine)
   BLI_rw_mutex_lock(&re->resultmutex, THREAD_LOCK_WRITE);
   render_result_free_list(&re->fullresult, re->result);
   re->result = render_result_new(re, &re->disprect, RR_USE_MEM, RR_ALL_LAYERS, RR_ALL_VIEWS);
+  re->result->stamp_data = stamp_data;
   BLI_rw_mutex_unlock(&re->resultmutex);
 
   LISTBASE_FOREACH (RenderLayer *, rl, &re->result->layers) {