Page MenuHome
Differential D13822

BLF: Enable Filtering of woff and woff2 Files
ClosedPublic
Actions

Authored by Harley Acheson (harley) on Jan 12 2022, 8:15 PM.

Details

Reviewers
Campbell Barton (campbellbarton)
Commits
rB55c90df316c7: BLF: Enable Filtering of woff and woff2 Fonts
Summary

Add files with extension ".woff" and ".woff2" to FILE_TYPE_FTFONT
file type. Allows selecting and using these types of font files.

This can only go in after we land update FreeType with optional brotli compression in order to support "Woff2" font files D13448: Freetype 2.11.0 with woff2 support.

Diff Detail

Repository
rB Blender

Event Timeline

Harley Acheson (harley) requested review of this revision.Jan 12 2022, 8:15 PM
Harley Acheson (harley) created this revision.
Harley Acheson (harley) mentioned this in T94030: Font Changes (Parent Task).
Harley Acheson (harley) updated this revision to Diff 47012.Jan 12 2022, 10:08 PM

Print errors to console if the font file, or the format of it, is not usable.

Harley Acheson (harley) added a project: BF Blender (3.2).Jan 21 2022, 8:33 PM
Harley Acheson (harley) updated this revision to Diff 47335.Jan 21 2022, 11:05 PM
Harley Acheson (harley) edited projects, added BF Blender (3.1); removed BF Blender (3.2).

Updated to the current state of master.

Harley Acheson (harley) added a reviewer: Campbell Barton (campbellbarton).Jan 21 2022, 11:07 PM
Harley Acheson (harley) updated this revision to Diff 48055.Feb 7 2022, 8:18 PM
Harley Acheson (harley) removed a project: BF Blender (3.1).

Updated to the current state of master.

Campbell Barton (campbellbarton) accepted this revision.Feb 8 2022, 5:25 AM
Campbell Barton (campbellbarton) added inline comments.
source/blender/blenfont/intern/blf_font.c
1241–1246

This function could instead take a const char **r_err_msg, so the caller can show the error (it could be used in a Python exception for example).

Although this isn't so much related to this patch to expose a new filetype.

This revision is now accepted and ready to land.Feb 8 2022, 5:25 AM
Harley Acheson (harley) added a comment.Feb 8 2022, 5:18 PM

@Campbell Barton (campbellbarton) - This function could instead take a const char **r_err_msg, so the caller can show the error (it could be used in a Python exception for example).

This shouldn't ever fail in any normal circumstance. I only wanted to add these printfs for the weird possibility that Blender is ever compiled against a FreeType that does not have brotli compression library enabled. In that case everything would work fine but ".woff2" fonts wouldn't load.

Closed by commit rB55c90df316c7: BLF: Enable Filtering of woff and woff2 Fonts (authored by Harley Acheson (harley)). · Explain WhyFeb 8 2022, 5:44 PM
This revision was automatically updated to reflect the committed changes.
Harley Acheson (harley) added a commit: rB55c90df316c7: BLF: Enable Filtering of woff and woff2 Fonts.

Revision Contents
Changeset List

PathSize
source/
blender/
blenfont/
intern/
6 lines
editors/
space_file/
3 lines

Diff 47335

View Options

source/blender/blenfont/intern/blf_font.c

Loading...
View Options

source/blender/editors/space_file/filelist.c

Loading...