From d4fc451b90be4b3bbb9d93713c1cca36e3ee42d5 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brecht@blender.org>
Date: Mon, 26 Sep 2022 21:13:23 +0200
Subject: Fix T101354: Cycles crash with baking and adaptive sampling

---
 intern/cycles/session/tile.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'intern')

diff --git a/intern/cycles/session/tile.cpp b/intern/cycles/session/tile.cpp
index f4930cbb945..362372f1d7b 100644
--- a/intern/cycles/session/tile.cpp
+++ b/intern/cycles/session/tile.cpp
@@ -7,6 +7,7 @@
 
 #include "graph/node.h"
 #include "scene/background.h"
+#include "scene/bake.h"
 #include "scene/film.h"
 #include "scene/integrator.h"
 #include "scene/scene.h"
@@ -367,7 +368,9 @@ void TileManager::update(const BufferParams &params, const Scene *scene)
     node_to_image_spec_atttributes(
         &write_state_.image_spec, &denoise_params, ATTR_DENOISE_SOCKET_PREFIX);
 
-    if (adaptive_sampling.use) {
+    /* Not adaptive sampling overscan yet for baking, would need overscan also
+     * for buffers read from the output driver. */
+    if (adaptive_sampling.use && !scene->bake_manager->get_baking()) {
       overscan_ = 4;
     }
     else {
-- 
cgit v1.2.3