Blender Git Loki
Git Commits -> Revision 0d7dbbb
Revision 0d7dbbb by Brecht Van Lommel (master) June 28, 2013, 13:05 (GMT) |
Fix #35884: crash opening .blend with generated color grid image and preview render. Printing text on the color grid image would initialize font glyphs from a thread at the same time as the UI, causing conflicts. The freetype glyph renderer needs to be mutex locked because it uses a shared buffer internally even when rendering for different fonts. Also needed to change the image generate function to use the render monospace font to avoid conflicts in blenfont. What's still weak in the blenfont API is that there is no distinction between a font and a thread using that font to render with some particular size, style, etc. |
Commit Details:
Full Hash: 0d7dbbb6e1fc0bb85d236ca1e04ff966f4ad39c9
SVN Revision: 57845
Parent Commit: ca33bea
Lines Changed: +35, -3
6 Modified Paths:
/source/blender/blenfont/intern/blf.c (+1, -0) (Diff)
/source/blender/blenfont/intern/blf_dir.c (+1, -0) (Diff)
/source/blender/blenfont/intern/blf_font.c (+5, -0) (Diff)
/source/blender/blenfont/intern/blf_glyph.c (+24, -2) (Diff)
/source/blender/blenfont/intern/blf_internal_types.h (+3, -0) (Diff)
/source/blender/blenkernel/intern/image_gen.c (+1, -1) (Diff)
/source/blender/blenfont/intern/blf_dir.c (+1, -0) (Diff)
/source/blender/blenfont/intern/blf_font.c (+5, -0) (Diff)
/source/blender/blenfont/intern/blf_glyph.c (+24, -2) (Diff)
/source/blender/blenfont/intern/blf_internal_types.h (+3, -0) (Diff)
/source/blender/blenkernel/intern/image_gen.c (+1, -1) (Diff)