diff options
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/path.cpp | 13 | ||||
| -rw-r--r-- | intern/cycles/util/path.h | 3 |
2 files changed, 2 insertions, 14 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 diff --git a/intern/cycles/util/path.h b/intern/cycles/util/path.h index 7ec5ed60d7f..98c3302eae2 100644 --- a/intern/cycles/util/path.h +++ b/intern/cycles/util/path.h @@ -32,10 +32,9 @@ CCL_NAMESPACE_BEGIN /* program paths */ -void path_init(const string &path = "", const string &user_path = "", const string &tmp_path = ""); +void path_init(const string &path = "", const string &user_path = ""); string path_get(const string &sub = ""); string path_user_get(const string &sub = ""); -string path_temp_get(const string &sub = ""); string path_cache_get(const string &sub = ""); /* path string manipulation */ |