Commit: 7a7b5bc6d3c8d9715c123332500a19b6cf09728d
Author: Bastien Montagne
Date: Tue Oct 6 12:23:50 2015 +0200
Branches: missing-libs
https://developer.blender.org/rB7a7b5bc6d3c8d9715c123332500a19b6cf09728d
Merge branch 'master' into missing-libs
===================================================================
===================================================================
diff --cc source/blender/blenkernel/BKE_font.h
index 7751de8,f20c166..5dcc6f8
--- a/source/blender/blenkernel/BKE_font.h
+++ b/source/blender/blenkernel/BKE_font.h
@@@ -79,9 -79,10 +79,11 @@@ void BKE_vfont_builtin_register(void *m
void BKE_vfont_free_data(struct VFont *vfont);
void BKE_vfont_free(struct VFont *sc);
+void BKE_vfont_init(struct VFont *vfont);
struct VFont *BKE_vfont_builtin_get(void);
- struct VFont *BKE_vfont_load(struct Main *bmain, const char *name);
+ struct VFont *BKE_vfont_load(struct Main *bmain, const char *filepath);
+ struct VFont *BKE_vfont_load_exists_ex(struct Main *bmain, const char
*filepath, bool *r_exists);
+ struct VFont *BKE_vfont_load_exists(struct Main *bmain, const char *filepath);
bool BKE_vfont_to_curve_ex(struct Main *bmain, struct Object *ob, int mode,
struct ListBase *r_nubase,
diff --cc source/blender/blenkernel/intern/font.c
index 2dca73f,e3ebb7f..b12e16d
--- a/source/blender/blenkernel/intern/font.c
+++ b/source/blender/blenkernel/intern/font.c
@@@ -203,27 -203,7 +203,27 @@@ static VFontData *vfont_get_data(Main *
return vfont->data;
}
+/* Bad naming actually in this case... */
+void BKE_vfont_init(VFont *vfont)
+{
+ PackedFile *pf = get_builtin_packedfile();
+
+ if (pf) {
+ VFontData *vfd;
+
+ vfd = BLI_vfontdata_from_freetypefont(pf);
+ if (vfd) {
+ vfont->data = vfd;
+
+ BLI_strncpy(vfont->name, FO_BUILTIN_NAME,
sizeof(vfont->name));
+ }
+
+ /* Free the packed file */
+ freePackedFile(pf);
+ }
+}
+
- VFont *BKE_vfont_load(Main *bmain, const char *name)
+ VFont *BKE_vfont_load(Main *bmain, const char *filepath)
{
char filename[FILE_MAXFILE];
VFont *vfont = NULL;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
