diff options
| author | Diego Hernan Borghetti <bdiego@gmail.com> | 2013-11-23 22:36:38 +0400 |
|---|---|---|
| committer | Diego Hernan Borghetti <bdiego@gmail.com> | 2013-11-24 03:20:23 +0400 |
| commit | 4c4aeaa5467e7f303aeb0da55731ee2294d6b376 (patch) | |
| tree | d6ac0213fd80da5f6681a9af9f190f19eebee012 /source/blender/blenfont | |
| parent | 673bd9a009062807c16cc31a263018737c148a96 (diff) | |
Fix: Wrong variable used to check for metrics files on BLF
Looks like this is has been there since the initial commit
of BLF.
The blf_dir_metrics_search was using the pointer to the
extension of the file and not the full path to check for
metrics files (.afm/.pfm).
Never notice before probably because is not common to use a font
with additional metrics files.
Diffstat (limited to 'source/blender/blenfont')
| -rw-r--r-- | source/blender/blenfont/intern/blf_dir.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenfont/intern/blf_dir.c b/source/blender/blenfont/intern/blf_dir.c index 721e86fbf21..da4d0b77a73 100644 --- a/source/blender/blenfont/intern/blf_dir.c +++ b/source/blender/blenfont/intern/blf_dir.c @@ -199,14 +199,14 @@ char *blf_dir_metrics_search(const char *filename) s[2] = 'm'; /* first check .afm */ - if (BLI_exists(s)) - return s; + if (BLI_exists(mfile)) + return mfile; /* and now check .pfm */ s[0] = 'p'; - if (BLI_exists(s)) - return s; + if (BLI_exists(mfile)) + return mfile; } MEM_freeN(mfile); return NULL; |