From f86fbc4ea31f743b8a28d4f91dc2eff209740507 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 10 Jan 2014 00:03:49 +0600 Subject: Remove direct displist creation from BKE_vfont_to_curve_ex() This goes back to ancient era again and such a call isn't safe for threading and really DAG is to make it sure display list for dependencies is always there. --- source/blender/blenkernel/BKE_font.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'source/blender/blenkernel/BKE_font.h') diff --git a/source/blender/blenkernel/BKE_font.h b/source/blender/blenkernel/BKE_font.h index d7c40e8e719..b60c833c686 100644 --- a/source/blender/blenkernel/BKE_font.h +++ b/source/blender/blenkernel/BKE_font.h @@ -38,7 +38,6 @@ extern "C" { #include struct VFont; -struct Scene; struct Object; struct Curve; struct objfnt; @@ -85,13 +84,13 @@ void BKE_vfont_free(struct VFont *sc); struct VFont *BKE_vfont_builtin_get(void); struct VFont *BKE_vfont_load(struct Main *bmain, const char *name); -bool BKE_vfont_to_curve_ex(struct Main *bmain, struct Scene *scene, struct Object *ob, int mode, +bool BKE_vfont_to_curve_ex(struct Main *bmain, struct Object *ob, int mode, struct ListBase *r_nubase, const wchar_t **r_text, int *r_text_len, bool *r_text_free, struct CharTrans **r_chartransdata); -bool BKE_vfont_to_curve_nubase(struct Main *bmain, struct Scene *scene, struct Object *ob, int mode, +bool BKE_vfont_to_curve_nubase(struct Main *bmain, struct Object *ob, int mode, struct ListBase *r_nubase); -bool BKE_vfont_to_curve(struct Main *bmain, struct Scene *scene, struct Object *ob, int mode); +bool BKE_vfont_to_curve(struct Main *bmain, struct Object *ob, int mode); int BKE_vfont_select_get(struct Object *ob, int *r_start, int *r_end); -- cgit v1.2.3