blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Merge branch 'blender-v2.92-release'

This commit is contained in:
Brecht Van Lommel 2021-01-21 13:20:58 +01:00
parent 324d6d2192 aff7d59986
commit f4d07196bd
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/render/session.cpp
View File

@ -541,8 +541,12 @@ bool Session::acquire_tile(RenderTile &rtile, Device *tile_device, uint tile_typ
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);
/* Move buffer to current tile device again in case it was stolen before.
* Not needed for denoising since that already handles mapping of tiles and
* neighbors to its own device. */
if (rtile.task != RenderTile::DENOISE) {
tile->buffers->buffer.move_device(tile_device);
}
}
tile->buffers->map_neighbor_copied = false;