Commit: ef6d6524280d27d5e665658b538ed226bc67c65c
Author: Brecht Van Lommel
Date: Mon Jan 25 14:26:32 2021 +0100
Branches: blender-v2.92-release
https://developer.blender.org/rBef6d6524280d27d5e665658b538ed226bc67c65c
Fix T83344: Cycles baking with progressive refine fails on GPU
===================================================================
M intern/cycles/render/session.cpp
===================================================================
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index 70b140ee9c6..7a30ecb24f7 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,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
