diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2021-09-20 15:37:14 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-09-20 16:56:24 +0300 |
| commit | 274348f0356cd4a94602832f59fdff18ee9119c8 (patch) | |
| tree | 7f4f89788574b14db8219234c5c4301f95b4000d | |
| parent | c010abd4cad96a11954bad69a805882922d116c2 (diff) | |
Fix baking failing with auto tiles, disable since it's not supported yet
| -rw-r--r-- | intern/cycles/blender/blender_session.cpp | 1 | ||||
| -rw-r--r-- | intern/cycles/render/session.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index 6fd731555fd..5593ea0085b 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -677,6 +677,7 @@ void BlenderSession::bake(BL::Depsgraph &b_depsgraph_, session->read_render_tile_cb = [&]() { read_render_tile(); }; session->write_render_tile_cb = [&]() { write_render_tile(); }; + session->set_gpu_display(nullptr); if (!session->progress.get_cancel()) { /* Sync scene. */ diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index 2a4f0d405f3..f2206454a47 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -385,7 +385,8 @@ void Session::draw() int2 Session::get_effective_tile_size() const { - if (!params.use_auto_tile) { + /* No support yet for baking with tiles. */ + if (!params.use_auto_tile || scene->bake_manager->get_baking()) { return make_int2(buffer_params_.width, buffer_params_.height); } |