From 5ff0d465ee219e43d4125b2d443dd19d4baad867 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 6 Jan 2014 01:48:25 +1100 Subject: Text3d: minor edits to the API, remove BKE_vfont_to_curve_nubase_ex --- source/blender/blenkernel/intern/font.c | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) (limited to 'source/blender/blenkernel/intern/font.c') diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c index 1d268b7d7ce..a70ab000a32 100644 --- a/source/blender/blenkernel/intern/font.c +++ b/source/blender/blenkernel/intern/font.c @@ -495,10 +495,10 @@ static float char_width(Curve *cu, VChar *che, CharInfo *info) } } -bool BKE_vfont_to_curve_nubase_ex(Main *bmain, Scene *scene, Object *ob, int mode, - 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_ex(Main *bmain, Scene *scene, Object *ob, int mode, + ListBase *r_nubase, + const wchar_t **r_text, int *r_text_len, bool *r_text_free, + struct CharTrans **r_chartransdata) { Curve *cu = ob->data; EditFont *ef = cu->editfont; @@ -1101,27 +1101,16 @@ bool BKE_vfont_to_curve_nubase(Main *bmain, Scene *scene, Object *ob, int mode, { BLI_assert(ob->type == OB_FONT); - return BKE_vfont_to_curve_nubase_ex(bmain, scene, ob, mode, - r_nubase, - NULL, NULL, NULL, NULL); -} - -bool BKE_vfont_to_curve_ex(Main *bmain, Scene *scene, Object *ob, int mode, - const wchar_t **r_text, int *r_text_len, bool *r_text_free, - struct CharTrans **r_chartransdata) -{ - Curve *cu = (Curve *) ob->data; - - BLI_assert(ob->type == OB_FONT); - - return BKE_vfont_to_curve_nubase_ex(bmain, scene, ob, mode, - &cu->nurb, - r_text, r_text_len, r_text_free, r_chartransdata); + return BKE_vfont_to_curve_ex(bmain, scene, ob, mode, + r_nubase, + NULL, NULL, NULL, NULL); } - bool BKE_vfont_to_curve(Main *bmain, Scene *scene, Object *ob, int mode) { + Curve *cu = ob->data; + return BKE_vfont_to_curve_ex(bmain, scene, ob, mode, + &cu->nurb, NULL, NULL, NULL, NULL); } -- cgit v1.2.3