[Bf-blender-cvs] [10ae2ea4ae0] master: Cleanup: remove unused temp directory initialization
Campbell Barton
noreply at git.blender.org
Sat Oct 3 10:52:35 CEST 2020
Commit: 10ae2ea4ae073c09a3b127d4a92915bbc4a61583
Author: Campbell Barton
Date: Sat Oct 3 17:23:13 2020 +1000
Branches: master
https://developer.blender.org/rB10ae2ea4ae073c09a3b127d4a92915bbc4a61583
Cleanup: remove unused temp directory initialization
This last worked in v2.27 (2003) where all paths were initialized to "/"
which was still checked to initialize the temp directory.
This hasn't been the case since 932e9e831647604e0b129b55e5ab035
where it changed to "/tmp/", then an empty string (current default).
===================================================================
M source/blender/blenkernel/BKE_appdir.h
M source/blender/blenkernel/intern/appdir.c
M source/blender/windowmanager/intern/wm_files.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_appdir.h b/source/blender/blenkernel/BKE_appdir.h
index b8a4497c7be..9223a60c8ef 100644
--- a/source/blender/blenkernel/BKE_appdir.h
+++ b/source/blender/blenkernel/BKE_appdir.h
@@ -60,7 +60,6 @@ bool BKE_appdir_program_python_search(char *fullpath,
/* Initialize path to temporary directory. */
void BKE_tempdir_init(char *userdir);
-void BKE_tempdir_system_init(char *dir);
const char *BKE_tempdir_base(void);
const char *BKE_tempdir_session(void);
diff --git a/source/blender/blenkernel/intern/appdir.c b/source/blender/blenkernel/intern/appdir.c
index 236f1391443..2f7b2cc480c 100644
--- a/source/blender/blenkernel/intern/appdir.c
+++ b/source/blender/blenkernel/intern/appdir.c
@@ -998,14 +998,6 @@ const char *BKE_tempdir_base(void)
return btempdir_base;
}
-/**
- * Path to the system temporary directory (with trailing slash)
- */
-void BKE_tempdir_system_init(char *dir)
-{
- where_is_temp(dir, NULL, FILE_MAX, NULL);
-}
-
/**
* Delete content of this instance's temp dir.
*/
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index 44367969ed7..69b7c7bb1e3 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -415,9 +415,6 @@ static void wm_init_userdef(Main *bmain)
MEM_CacheLimiter_set_maximum(((size_t)U.memcachelimit) * 1024 * 1024);
BKE_sound_init(bmain);
- if (STREQ(U.tempdir, "/")) {
- BKE_tempdir_system_init(U.tempdir);
- }
/* Update `U.tempdir` from user preferences. */
BKE_tempdir_init(U.tempdir);
More information about the Bf-blender-cvs
mailing list