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:
authorCampbell Barton <campbell@blender.org>2022-03-24 08:33:32 +0300
committerCampbell Barton <campbell@blender.org>2022-03-24 08:54:01 +0300
commit4682a0882f02c50b20aa3c4bf9abe9f7ec2e834b (patch)
tree36dc6fb09eaa1d539e516875ed957aba5334666e /source/blender/blenfont/intern/blf.c
parent5058c4b1446f58bb9a5ddcb65f7353d9df3a594a (diff)
Cleanup: use "filepath" instead of "filename" for full paths
Reserve "filename" when only the name component is used.
Diffstat (limited to 'source/blender/blenfont/intern/blf.c')
-rw-r--r--source/blender/blenfont/intern/blf.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c
index 043d6da7d73..17d6e431632 100644
--- a/source/blender/blenfont/intern/blf.c
+++ b/source/blender/blenfont/intern/blf.c
@@ -158,14 +158,14 @@ int BLF_load_unique(const char *name)
return -1;
}
- char *filename = blf_dir_search(name);
- if (!filename) {
+ char *filepath = blf_dir_search(name);
+ if (!filepath) {
printf("Can't find font: %s\n", name);
return -1;
}
- FontBLF *font = blf_font_new(name, filename);
- MEM_freeN(filename);
+ FontBLF *font = blf_font_new(name, filepath);
+ MEM_freeN(filepath);
if (!font) {
printf("Can't load font: %s\n", name);
@@ -869,9 +869,9 @@ void BLF_draw_buffer(int fontid, const char *str, const size_t str_len)
BLF_draw_buffer_ex(fontid, str, str_len, NULL);
}
-char *BLF_display_name_from_file(const char *filename)
+char *BLF_display_name_from_file(const char *filepath)
{
- FontBLF *font = blf_font_new("font_name", filename);
+ FontBLF *font = blf_font_new("font_name", filepath);
if (!font) {
return NULL;
}