Text3d: minor edits to the API, remove BKE_vfont_to_curve_nubase_ex

3 files changed, 14 insertions, 29 deletions

diff --git a/source/blender/blenkernel/BKE_font.h b/source/blender/blenkernel/BKE_font.h
index 1d52aa6edcc..769771363ec 100644
--- a/source/blender/blenkernel/BKE_font.h
+++ b/source/blender/blenkernel/BKE_font.h
@@ -83,16 +83,12 @@ 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_nubase_ex(struct Main *bmain, struct Scene *scene, 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,
-                                  struct ListBase *r_nubase);
-
 bool BKE_vfont_to_curve_ex(struct Main *bmain, struct Scene *scene, 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,
+                               struct ListBase *r_nubase);
 bool BKE_vfont_to_curve(struct Main *bmain, struct Scene *scene, struct Object *ob, int mode);
 
 int BKE_vfont_select_get(struct Object *ob, int *r_start, int *r_end);
diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c
index a84ce5677b0..e108df058ce 100644
--- a/source/blender/blenkernel/intern/anim.c
+++ b/source/blender/blenkernel/intern/anim.c
@@ -1638,7 +1638,7 @@ static void font_duplilist(ListBase *lb, Scene *scene, Object *par, int persiste
 	
 	/* in par the family name is stored, use this to find the other objects */
 	
-	BKE_vfont_to_curve_ex(G.main, scene, par, FO_DUPLI,
+	BKE_vfont_to_curve_ex(G.main, scene, par, FO_DUPLI, NULL,
 	                      &text, &text_len, &text_free, &chartransdata);
 
 	if (text == NULL || chartransdata == NULL) {
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);
 }