blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 762 Projects 19 Wiki Activity

Merge branch 'blender-v2.83-release'

This commit is contained in:
Philipp Oeser 2020-04-27 18:15:47 +02:00
parent 0a7dd1ec49 fbae4c5ba3
commit 5f3990d69a
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/object/object_add.c
View File

@ -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;