diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-05 08:54:47 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-05 08:54:47 +0300 |
| commit | 49b86bcfec6885952458b3791cfc599463f02a35 (patch) | |
| tree | 902cce1e99b2f5182c3a87640d36a310748dc62b /intern/cycles/render | |
| parent | 53c63db2ee1bd544384840915c7f562819a7dbbc (diff) | |
| parent | cd17b3258327522b8c6f56a3ee7239a91f2be149 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/render')
| -rw-r--r-- | intern/cycles/render/buffers.h | 1 | ||||
| -rw-r--r-- | intern/cycles/render/session.cpp | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/render/buffers.h b/intern/cycles/render/buffers.h index dfc98fe2061..ee7c0490dfd 100644 --- a/intern/cycles/render/buffers.h +++ b/intern/cycles/render/buffers.h @@ -137,6 +137,7 @@ public: int tile_index; device_ptr buffer; + int device_size; RenderBuffers *buffers; diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index bb636dd962a..3106ee53832 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -502,6 +502,9 @@ void Session::map_neighbor_tiles(RenderTile *tiles, Device *tile_device) assert(tiles[4].buffers); device->map_neighbor_tiles(tile_device, tiles); + + /* The denoised result is written back to the original tile. */ + tiles[9] = tiles[4]; } void Session::unmap_neighbor_tiles(RenderTile *tiles, Device *tile_device) |