diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-09-26 22:13:23 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-09-26 23:16:01 +0300 |
| commit | d4fc451b90be4b3bbb9d93713c1cca36e3ee42d5 (patch) | |
| tree | a47aa11ff78a2204eda1d6de8436fa575a4f3a0e /intern/cycles | |
| parent | ddf6f70049e5a9f537ce15a5412bb67b4229ef43 (diff) | |
Fix T101354: Cycles crash with baking and adaptive sampling
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/session/tile.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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 ¶ms, 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 { |