Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey@blender.org>2022-01-10 18:05:17 +0300
committerSergey Sharybin <sergey@blender.org>2022-01-10 18:54:12 +0300
commit292c2cefe30b3b4798324e0f04e3a4a529829c94 (patch)
treea2ef4c57898f432eedd895c1a83ba1af178e6155 /intern/cycles/session/tile.h
parent20cb2c72a559786b69a3f45695b072dd0beae99a (diff)
Fix T93727: Tiled render error in Cycles after changing temp directory
Consider temporary directory to be variant part of session configuration which gets communicated to the tile manager on render reset. This allows to be able to render with one temp directory, change the directory, render again and have proper render result even with enabled persistent data. For the ease of access to the temp directory expose it via the render engine API (engine.temp_directory). Differential Revision: https://developer.blender.org/D13790
Diffstat (limited to 'intern/cycles/session/tile.h')
-rw-r--r--intern/cycles/session/tile.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/session/tile.h b/intern/cycles/session/tile.h
index 7c8f7570d3e..80a5db543cd 100644
--- a/intern/cycles/session/tile.h
+++ b/intern/cycles/session/tile.h
@@ -71,6 +71,8 @@ class TileManager {
* Will store all parameters needed for buffers access outside of the scene graph. */
void update(const BufferParams &params, const Scene *scene);
+ void set_temp_dir(const string &temp_dir);
+
inline int get_num_tiles() const
{
return tile_state_.num_tiles;
@@ -136,6 +138,8 @@ class TileManager {
bool open_tile_output();
bool close_tile_output();
+ string temp_dir_;
+
/* Part of an on-disk tile file name which avoids conflicts between several Cycles instances or
* several sessions. */
string tile_file_unique_part_;