From 274348f0356cd4a94602832f59fdff18ee9119c8 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 20 Sep 2021 14:37:14 +0200 Subject: Fix baking failing with auto tiles, disable since it's not supported yet --- intern/cycles/blender/blender_session.cpp | 1 + intern/cycles/render/session.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) 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); } -- cgit v1.2.3