diff options
| author | Sergey Sharybin <sergey@blender.org> | 2022-01-10 18:05:17 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey@blender.org> | 2022-01-10 18:54:12 +0300 |
| commit | 292c2cefe30b3b4798324e0f04e3a4a529829c94 (patch) | |
| tree | a2ef4c57898f432eedd895c1a83ba1af178e6155 /intern/cycles/util/path.cpp | |
| parent | 20cb2c72a559786b69a3f45695b072dd0beae99a (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/util/path.cpp')
| -rw-r--r-- | intern/cycles/util/path.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/intern/cycles/util/path.cpp b/intern/cycles/util/path.cpp index e27c929fba9..4efdeeae7f0 100644 --- a/intern/cycles/util/path.cpp +++ b/intern/cycles/util/path.cpp @@ -66,7 +66,6 @@ typedef struct stat path_stat_t; static string cached_path = ""; static string cached_user_path = ""; -static string cached_temp_path = ""; static string cached_xdg_cache_path = ""; namespace { @@ -336,11 +335,10 @@ static string path_xdg_cache_get() } #endif -void path_init(const string &path, const string &user_path, const string &temp_path) +void path_init(const string &path, const string &user_path) { cached_path = path; cached_user_path = user_path; - cached_temp_path = temp_path; #ifdef _MSC_VER // workaround for https://svn.boost.org/trac/boost/ticket/6320 @@ -384,15 +382,6 @@ string path_cache_get(const string &sub) #endif } -string path_temp_get(const string &sub) -{ - if (cached_temp_path == "") { - cached_temp_path = Filesystem::temp_directory_path(); - } - - return path_join(cached_temp_path, sub); -} - #if defined(__linux__) || defined(__APPLE__) string path_xdg_home_get(const string &sub = ""); #endif |