diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-01-05 18:33:45 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-01-05 18:37:19 +0400 |
| commit | 3b024d63fe50d8e69d2d76e009f032cad3f1a538 (patch) | |
| tree | c96e952a539c783b3e91457f5c673bb98c9832bc /source/blender/editors | |
| parent | 38bbd9c778d6733f21732df1f51dd2dc5236fa44 (diff) | |
Text3d: fix font family feature for unicode and correct tooltip
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 | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c index 2263c69b712..1fbd3a0f9f5 100644 --- a/source/blender/editors/curve/editfont.c +++ b/source/blender/editors/curve/editfont.c @@ -264,7 +264,7 @@ static void text_update_edited(bContext *C, Scene *scene, Object *obedit, const } } - BKE_vfont_to_curve(bmain, scene, obedit, mode, NULL); + BKE_vfont_to_curve(bmain, scene, obedit, mode); if (recalc) DAG_id_tag_update(obedit->data, 0); @@ -1037,7 +1037,7 @@ static int move_cursor(bContext *C, int type, int select) if (ef->selstart) { struct Main *bmain = CTX_data_main(C); ef->selstart = ef->selend = 0; - BKE_vfont_to_curve(bmain, scene, obedit, FO_SELCHANGE, NULL); + BKE_vfont_to_curve(bmain, scene, obedit, FO_SELCHANGE); } } diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 82b6f15dc38..f7fb2a29cdb 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -930,9 +930,6 @@ static void copy_attr(Main *bmain, Scene *scene, View3D *v3d, short event) if (cu1->vfontbi) cu1->vfontbi->id.us--; cu1->vfontbi = cu->vfontbi; id_us_plus((ID *)cu1->vfontbi); - - BKE_vfont_to_curve(bmain, scene, base->object, FO_EDIT, NULL); /* needed? */ - BLI_strncpy(cu1->family, cu->family, sizeof(cu1->family)); |