diff options
author | Hans Goudey <h.goudey@me.com> | 2021-01-25 20:48:53 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2021-01-25 20:48:53 +0300 |
commit | 93e3aed04145892bfec06b571da138ebf9aca7e3 (patch) | |
tree | 6961f7bdb606d12ffc2163bc5dd355364ae24dfe /intern | |
parent | 51c433f1a52dfd0a0d51f3d8a2a954352be09b98 (diff) | |
parent | aa030d34599387aa560da7db38b0e119c06f1530 (diff) |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/render/session.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index d75246beaa0..3c601e18126 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -560,10 +560,12 @@ bool Session::acquire_tile(RenderTile &rtile, Device *tile_device, uint tile_typ if (read_bake_tile_cb) { /* This will read any passes needed as input for baking. */ if (tile_manager.state.sample == tile_manager.range_start_sample) { - thread_scoped_lock tile_lock(tile_mutex); - read_bake_tile_cb(rtile); + { + thread_scoped_lock tile_lock(tile_mutex); + read_bake_tile_cb(rtile); + } + rtile.buffers->buffer.copy_to_device(); } - rtile.buffers->buffer.copy_to_device(); } else { /* This will tag tile as IN PROGRESS in blender-side render pipeline, |