diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-01-03 07:18:06 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-01-03 07:20:35 +0400 |
commit | a5cb2229abbc7d43f34dabea332afd33614fc0db (patch) | |
tree | 3b039eeccbcc69589b0c9ac98245f941435b9fcd /source/blender/editors | |
parent | f345414b89a9d94cca668c10ce8f0464d06dea4f (diff) |
Text3d: avoid converting utf8 to wchar_t in editmode
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/curve/editfont.c | 4 | ||||
-rw-r--r-- | source/blender/editors/object/object_edit.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c index 59075d44c67..6bb6b286047 100644 --- a/source/blender/editors/curve/editfont.c +++ b/source/blender/editors/curve/editfont.c @@ -288,7 +288,7 @@ static void text_update_edited(bContext *C, Scene *scene, Object *obedit, int re if (mode == FO_EDIT) update_string(cu); - BKE_vfont_to_curve(bmain, scene, obedit, mode); + BKE_vfont_to_curve(bmain, scene, obedit, mode, NULL); if (recalc) DAG_id_tag_update(obedit->data, 0); @@ -955,7 +955,7 @@ static int move_cursor(bContext *C, int type, int select) struct Main *bmain = CTX_data_main(C); cu->selstart = cu->selend = 0; update_string(cu); - BKE_vfont_to_curve(bmain, scene, obedit, FO_SELCHANGE); + BKE_vfont_to_curve(bmain, scene, obedit, FO_SELCHANGE, NULL); } } diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index dc641dbe765..4dc9c6a2a9d 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -931,7 +931,7 @@ static void copy_attr(Main *bmain, Scene *scene, View3D *v3d, short event) cu1->vfontbi = cu->vfontbi; id_us_plus((ID *)cu1->vfontbi); - BKE_vfont_to_curve(bmain, scene, base->object, 0); /* needed? */ + BKE_vfont_to_curve(bmain, scene, base->object, FO_EDIT, NULL); /* needed? */ BLI_strncpy(cu1->family, cu->family, sizeof(cu1->family)); |