diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-01-09 21:34:52 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-01-09 22:36:37 +0400 |
| commit | 492277b4a140f153a760a5cb5f110bab4d8039ce (patch) | |
| tree | baa0fe7d33b14ebb1e9a3d39d85aa9f6dcfa2153 /source/blender/editors/object | |
| parent | 1914d804cf1eb8cce1f6e7390b94b702c2e3006b (diff) | |
Fix own regression in font->curve conversion
Issue was introduced in a2bf25e and was caused by
do_makeDispListCurveTypes() no longer placing nurbs
to cu->nurb list.
Such an operation isn't thread-safe and proper solution
would require having granular update. For until them
just make object conversion take care of filling cu->nurb
in with splines from font.
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/object_add.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 486e278c00c..efeed0f277c 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -68,6 +68,7 @@ #include "BKE_DerivedMesh.h" #include "BKE_displist.h" #include "BKE_effect.h" +#include "BKE_font.h" #include "BKE_group.h" #include "BKE_image.h" #include "BKE_lamp.h" @@ -1584,8 +1585,11 @@ static int convert_exec(bContext *C, wmOperator *op) cu = newob->data; - if ( !newob->curve_cache || !newob->curve_cache->disp.first) - BKE_displist_make_curveTypes(scene, newob, 0); + /* 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. + */ + BKE_vfont_to_curve(bmain, scene, newob, FO_EDIT); newob->type = OB_CURVE; cu->type = OB_CURVE; |