diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2020-04-27 19:15:47 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2020-04-27 19:15:47 +0300 |
| commit | 5f3990d69aed57d9f18b82d3f78f4932d144cf3a (patch) | |
| tree | f8e3b5653182d69a28b4f9d6c5472b2e37476c9a /source/blender/editors/object | |
| parent | 0a7dd1ec49378d4c02491f5e96f8e5073d01bde1 (diff) | |
| parent | fbae4c5ba3f6836b6223888de2fe346865acde31 (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/object_add.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 9119d1cac86..9e0a6d51614 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -2380,13 +2380,8 @@ static int convert_exec(bContext *C, wmOperator *op) cu = newob->data; - /* TODO(sergey): Ideally DAG will create nurbs list for a curve data - * datablock, but for until we've got granular update - * lets take care by selves. - */ - /* XXX This may fail/crash, since BKE_vfont_to_curve() - * accesses evaluated data in some cases (bastien). */ - BKE_vfont_to_curve(newob, FO_EDIT); + Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); + BKE_vfont_to_curve_ex(ob_eval, ob_eval->data, FO_EDIT, &cu->nurb, NULL, NULL, NULL, NULL); newob->type = OB_CURVE; cu->type = OB_CURVE; |