blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Preferences: remove temp directory initialization for WIN32 

Revert 76b1a27f96 since there is no
reason windows should behave differently to other platforms.

This was added so Windows users wouldn't see "/tmp/" in the UI.

Since then the default temporary directory is a blank string,
leave blank on all systems as Python script authors may accidentally
use this instead of `bpy.app.tempdir`.
This commit is contained in:
Campbell Barton 2020-10-03 17:51:30 +10:00
parent 10ae2ea4ae
commit 9b602a8020
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_appdir.h
View File

@ -59,7 +59,7 @@ bool BKE_appdir_program_python_search(char *fullpath,
const int version_minor);
/* Initialize path to temporary directory. */
void BKE_tempdir_init(char *userdir);
void BKE_tempdir_init(const char *userdir);
const char *BKE_tempdir_base(void);
const char *BKE_tempdir_session(void);

21
source/blender/blenkernel/intern/appdir.c
View File

@ -881,12 +881,13 @@ void BKE_appdir_app_templates(ListBase *templates)
*
* Also make sure the temp dir has a trailing slash
*
* \param fullname: The full path to the temporary temp directory
* \param basename: The full path to the persistent temp directory (may be NULL)
* \param maxlen: The size of the fullname buffer
* \param userdir: Directory specified in user preferences
* \param fullname: The full path to the temporary temp directory.
* \param basename: The full path to the persistent temp directory (may be NULL).
* \param maxlen: The size of the \a fullname buffer.
* \param userdir: Directory specified in user preferences (may be NULL).
* note that by default this is an empty string, only use when non-empty.
*/
static void where_is_temp(char *fullname, char *basename, const size_t maxlen, char *userdir)
static void where_is_temp(char *fullname, char *basename, const size_t maxlen, const char *userdir)
{
/* Clear existing temp dir, if needed. */
BKE_tempdir_session_purge();
@ -930,12 +931,6 @@ static void where_is_temp(char *fullname, char *basename, const size_t maxlen, c
else {
/* add a trailing slash if needed */
BLI_path_slash_ensure(fullname);
#ifdef WIN32
if (userdir && userdir != fullname) {
/* also set user pref to show %TEMP%. /tmp/ is just plain confusing for Windows users. */
BLI_strncpy(userdir, fullname, maxlen);
}
#endif
}
/* Now that we have a valid temp dir, add system-generated unique sub-dir. */
@ -974,10 +969,8 @@ static void where_is_temp(char *fullname, char *basename, const size_t maxlen, c
* Sets btempdir_base to userdir if specified and is a valid directory, otherwise
* chooses a suitable OS-specific temporary directory.
* Sets btempdir_session to a #mkdtemp generated sub-dir of btempdir_base.
*
* \note On Window userdir will be set to the temporary directory!
*/
void BKE_tempdir_init(char *userdir)
void BKE_tempdir_init(const char *userdir)
{
where_is_temp(btempdir_session, btempdir_base, FILE_MAX, userdir);
}