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:
authorMike Erwin <significant.bit@gmail.com>2017-02-05 07:12:53 +0300
committerMike Erwin <significant.bit@gmail.com>2017-02-05 07:12:53 +0300
commit590838201120b32a4d1e2453b199806a527968bf (patch)
tree6f57bd6a2edfab8b2caa8f21f8a2692beaef5d2b /source/blender/blenfont
parent627566cb9ac771c209508b3793f0c9456fb24798 (diff)
add BLF_default function
So we don't need two versions of all other BLF functions -- one for specific font ID & another for the default font.
Diffstat (limited to 'source/blender/blenfont')
-rw-r--r--source/blender/blenfont/BLF_api.h1
-rw-r--r--source/blender/blenfont/intern/blf.c6
2 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/blenfont/BLF_api.h b/source/blender/blenfont/BLF_api.h
index b6fc42d774e..e6d48d82a36 100644
--- a/source/blender/blenfont/BLF_api.h
+++ b/source/blender/blenfont/BLF_api.h
@@ -45,6 +45,7 @@ int BLF_init(int points, int dpi);
void BLF_exit(void);
void BLF_default_dpi(int dpi);
void BLF_default_set(int fontid);
+int BLF_default(void); /* get default font ID so we can pass it to other functions */
void BLF_cache_clear(void);
diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c
index 4b3a965efdf..87e56d55eef 100644
--- a/source/blender/blenfont/intern/blf.c
+++ b/source/blender/blenfont/intern/blf.c
@@ -175,6 +175,12 @@ void BLF_default_set(int fontid)
}
}
+int BLF_default()
+{
+ ASSERT_DEFAULT_SET;
+ return global_font_default;
+}
+
int BLF_load(const char *name)
{
FontBLF *font;