diff options
author | Campbell Barton <campbell@blender.org> | 2022-10-04 08:52:10 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-10-04 08:52:10 +0300 |
commit | 6b76381e0a52cf15513087e470a4a4c07471acc6 (patch) | |
tree | 92c0e1405a6a312f63cac77c9cfbb6f60f285375 /source | |
parent | bf4926b30c6fc7b9f98dde508b7b644feaf21022 (diff) |
Cleanup: rename BKE_appdir_folder_id_version, improve doc-strings
Rename BKE_appdir_folder_id_version to
BKE_appdir_resource_path_id_with_version because BKE_appdir_folder_id
and BKE_appdir_folder_id_version didn't accept compatible arguments.
Also add notes to GHOST_getSystemDir & GHOST_getUserDir that
BKE_appdir_resource_path_id(..) should be used instead (in most cases).
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/BKE_appdir.h | 5 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/appdir.c | 11 | ||||
-rw-r--r-- | source/blender/python/intern/bpy.c | 2 |
3 files changed, 13 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_appdir.h b/source/blender/blenkernel/BKE_appdir.h index 0f00ab9c321..a67c6c27b47 100644 --- a/source/blender/blenkernel/BKE_appdir.h +++ b/source/blender/blenkernel/BKE_appdir.h @@ -90,7 +90,10 @@ const char *BKE_appdir_folder_id_user_notest(int folder_id, * Returns the path of the top-level version-specific local, user or system directory. * If check_is_dir, then the result will be NULL if the directory doesn't exist. */ -const char *BKE_appdir_folder_id_version(int folder_id, int version, bool check_is_dir); +const char *BKE_appdir_resource_path_id_with_version(int folder_id, + bool check_is_dir, + int version); +const char *BKE_appdir_resource_path_id(int folder_id, bool check_is_dir); /** * Check if this is an install with user files kept together diff --git a/source/blender/blenkernel/intern/appdir.c b/source/blender/blenkernel/intern/appdir.c index 7c409f1095b..b2f1e75cd1d 100644 --- a/source/blender/blenkernel/intern/appdir.c +++ b/source/blender/blenkernel/intern/appdir.c @@ -760,9 +760,9 @@ const char *BKE_appdir_folder_id_create(const int folder_id, const char *subfold return path; } -const char *BKE_appdir_folder_id_version(const int folder_id, - const int version, - const bool check_is_dir) +const char *BKE_appdir_resource_path_id_with_version(const int folder_id, + const bool check_is_dir, + const int version) { static char path[FILE_MAX] = ""; bool ok; @@ -785,6 +785,11 @@ const char *BKE_appdir_folder_id_version(const int folder_id, return ok ? path : NULL; } +const char *BKE_appdir_resource_path_id(const int folder_id, const bool check_is_dir) +{ + return BKE_appdir_resource_path_id_with_version(folder_id, check_is_dir, BLENDER_VERSION); +} + /** \} */ /* -------------------------------------------------------------------- */ diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c index 3b3ffb321c3..861b4dddff9 100644 --- a/source/blender/python/intern/bpy.c +++ b/source/blender/python/intern/bpy.c @@ -322,7 +322,7 @@ static PyObject *bpy_resource_path(PyObject *UNUSED(self), PyObject *args, PyObj return NULL; } - path = BKE_appdir_folder_id_version(type.value_found, (major * 100) + minor, false); + path = BKE_appdir_resource_path_id_with_version(type.value_found, (major * 100) + minor, false); return PyC_UnicodeFromByte(path ? path : ""); } |