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:
authorAnkit Meel <ankitjmeel@gmail.com>2021-12-11 19:59:53 +0300
committerAnkit Meel <ankitjmeel@gmail.com>2021-12-11 19:59:53 +0300
commit9df13fba69c3b0e0e013db198515e6e1a7238f6a (patch)
treebd885ea12f406316ab38e42465cc864328c45bd2 /source/blender/blenkernel/intern/appdir.c
parent23be5fd4499ad92c049f140564df3e32cfe9cea3 (diff)
macOS: add tilde-based path expander
Replaces `HOME` environment variable usage for user directories like in D12802. Reviewed By: #platform_macos, brecht Differential Revision: https://developer.blender.org/D13212
Diffstat (limited to 'source/blender/blenkernel/intern/appdir.c')
-rw-r--r--source/blender/blenkernel/intern/appdir.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/appdir.c b/source/blender/blenkernel/intern/appdir.c
index a819459f989..9dd4c7e503a 100644
--- a/source/blender/blenkernel/intern/appdir.c
+++ b/source/blender/blenkernel/intern/appdir.c
@@ -175,10 +175,12 @@ const char *BKE_appdir_folder_default_or_root(void)
const char *BKE_appdir_folder_home(void)
{
-#ifndef WIN32
- return BLI_getenv("HOME");
-#else /* Windows */
+#ifdef WIN32
return BLI_getenv("userprofile");
+#elif defined(__APPLE__)
+ return BLI_expand_tilde("~/");
+#else
+ return BLI_getenv("HOME");
#endif
}
@@ -248,10 +250,8 @@ bool BKE_appdir_font_folder_default(char *dir)
BLI_strncpy_wchar_as_utf8(test_dir, wpath, sizeof(test_dir));
}
#elif defined(__APPLE__)
- const char *home = BLI_getenv("HOME");
- if (home) {
- BLI_path_join(test_dir, sizeof(test_dir), home, "Library", "Fonts", NULL);
- }
+ STRNCPY(test_dir, BLI_expand_tilde("~/Library/Fonts/"));
+ BLI_path_slash_ensure(test_dir);
#else
STRNCPY(test_dir, "/usr/share/fonts");
#endif