[Bf-blender-cvs] [cc1105f01b0] blender-v3.3-release: Fix T101354: Cycles crash with baking and adaptive sampling

[Brecht Van Lommel]

Commit: cc1105f01b0294a4a9758559f8b4e4d2f86a5117
Author: Brecht Van Lommel
Date:   Mon Sep 26 21:13:23 2022 +0200
Branches: blender-v3.3-release
https://developer.blender.org/rBcc1105f01b0294a4a9758559f8b4e4d2f86a5117

Fix T101354: Cycles crash with baking and adaptive sampling

===================================================================

M	intern/cycles/session/tile.cpp

===================================================================

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 {