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

[Sergey Sharybin]

Commit: c60913ef128f0e2a4628c69b4d14321ac2544918
Author: Sergey Sharybin
Date:   Thu Sep 2 10:42:35 2021 +0200
Branches: cycles-x
https://developer.blender.org/rBc60913ef128f0e2a4628c69b4d14321ac2544918

Merge branch 'master' into cycles-x

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



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

diff --cc source/blender/render/intern/engine.c
index 8aa59b46e21,5728b784714..ceb823ecece
--- a/source/blender/render/intern/engine.c
+++ b/source/blender/render/intern/engine.c
@@@ -390,14 -424,23 +402,8 @@@ void RE_engine_end_result
      return;
    }
  
-   if (!re->result->passes_allocated) {
-     BLI_rw_mutex_lock(&re->resultmutex, THREAD_LOCK_WRITE);
-     if (!re->result->passes_allocated) {
-       render_result_passes_allocated_ensure(re->result);
-     }
-     BLI_rw_mutex_unlock(&re->resultmutex);
-   }
+   re_ensure_passes_allocated_thread_safe(re);
  
 -  /* merge. on break, don't merge in result for preview renders, looks nicer */
 -  if (!highlight) {
 -    /* for exr tile render, detect tiles that are done */
 -    RenderPart *pa = get_part_from_result(re, result);
 -
 -    if (pa) {
 -      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
 -       * buffers, we are going to get OpenEXR save errors. */
 -      fprintf(stderr, "RenderEngine.end_result: dimensions do not match any OpenEXR tile.\n");
 -    }
 -  }
 -
    if (re->engine && (re->engine->flag & RE_ENGINE_HIGHLIGHT_TILES)) {
      BLI_mutex_lock(&re->highlighted_tiles_mutex);