Commit: 492277b4a140f153a760a5cb5f110bab4d8039ce
Author: Sergey Sharybin
Date: Thu Jan 9 23:34:52 2014 +0600
https://developer.blender.org/rB492277b4a140f153a760a5cb5f110bab4d8039ce
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.
===================================================================
M source/blender/editors/object/object_add.c
===================================================================
diff --git a/source/blender/editors/object/object_add.c
b/source/blender/editors/object/object_add.c
index 486e278..efeed0f 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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
