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-01-07 10:01:32 +0300
committerCampbell Barton <campbell@blender.org>2022-01-07 10:05:36 +0300
commit7c04bc9a0114b5b3a7159f5aade86d51719a4cf6 (patch)
treef63c249bb666443937e63e4602a19454e63353a2 /source/blender/editors
parentf24854005d8688fb86cf41bd62a63580c63f818d (diff)
Cleanup: exclude uiFont from DNA, rename filename -> filepath
This isn't saved to the preferences, so there is no need to store in DNA. Also remove unused `r_to_l` member.
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/interface/interface_style.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_style.c b/source/blender/editors/interface/interface_style.c
index 76063412758..c28769a4951 100644
--- a/source/blender/editors/interface/interface_style.c
+++ b/source/blender/editors/interface/interface_style.c
@@ -427,11 +427,11 @@ void uiStyleInit(void)
}
if (U.font_path_ui[0]) {
- BLI_strncpy(font_first->filename, U.font_path_ui, sizeof(font_first->filename));
+ BLI_strncpy(font_first->filepath, U.font_path_ui, sizeof(font_first->filepath));
font_first->uifont_id = UIFONT_CUSTOM1;
}
else {
- BLI_strncpy(font_first->filename, "default", sizeof(font_first->filename));
+ BLI_strncpy(font_first->filepath, "default", sizeof(font_first->filepath));
font_first->uifont_id = UIFONT_DEFAULT;
}
@@ -442,7 +442,7 @@ void uiStyleInit(void)
font->blf_id = BLF_load_default(unique);
}
else {
- font->blf_id = BLF_load(font->filename);
+ font->blf_id = BLF_load(font->filepath);
if (font->blf_id == -1) {
font->blf_id = BLF_load_default(unique);
}