Merge branch 'blender-v2.92-release'

2021-01-20 14:40:46 +01:00
parent 6a8f4bfc60 4a09907eab
commit fc5f9a8ac9
1 changed files with 4 additions and 0 deletions
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -540,6 +540,10 @@ bool Session::acquire_tile(RenderTile &rtile, Device *tile_device, uint tile_typ
    tile->buffers = new RenderBuffers(tile_device);
    tile->buffers->reset(buffer_params);
  }
+  else if (tile->buffers->buffer.device != tile_device) {
+    /* Move buffer to current tile device again in case it was stolen before. */
+    tile->buffers->buffer.move_device(tile_device);
+  }

  tile->buffers->map_neighbor_copied = false;