diff options
author | Patrick Mours <pmours@nvidia.com> | 2021-01-18 17:30:48 +0300 |
---|---|---|
committer | Patrick Mours <pmours@nvidia.com> | 2021-01-18 17:30:48 +0300 |
commit | ce0f212498c3347f512966bf85d08feefe1d032e (patch) | |
tree | e1b31d789db31b6bb9994599f52a1dcb759b9949 /intern | |
parent | 023ebb890b760f4d6e7bcaa4848e5f5339ac1321 (diff) | |
parent | 4fde594fda13abf98437bc5d0012decc2bd3d5f6 (diff) |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/render/session.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index a00f8154148..0debc08d911 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -459,7 +459,11 @@ bool Session::acquire_tile(RenderTile &rtile, Device *tile_device, uint tile_typ int device_num = device->device_number(tile_device); while (!tile_manager.next_tile(tile, device_num, tile_types)) { - if (steal_tile(rtile, tile_device, tile_lock)) { + /* Can only steal tiles on devices that support rendering + * This is because denoising tiles cannot be stolen (see below) + */ + if ((tile_types & (RenderTile::PATH_TRACE | RenderTile::BAKE)) && + steal_tile(rtile, tile_device, tile_lock)) { return true; } |