Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-08-21 17:13:48 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-08-21 17:13:48 +0400
commitd4b90378a7c7df21ebfc4c3d4c78d50044c38109 (patch)
tree6169cae9807ae0bc9fea174c586d694293c8bd32 /source/blender/blenkernel/intern/displist.c
parente84be419460a677efc09542056a69aaa6e616d99 (diff)
Copying of nurbs shall happen after converting font to curves
Otherwise changing font settings wouldn't apply instantly.
Diffstat (limited to 'source/blender/blenkernel/intern/displist.c')
-rw-r--r--source/blender/blenkernel/intern/displist.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c
index f90a489ee1a..5fa62c22a34 100644
--- a/source/blender/blenkernel/intern/displist.c
+++ b/source/blender/blenkernel/intern/displist.c
@@ -1374,8 +1374,6 @@ static void do_makeDispListCurveTypes(Scene *scene, Object *ob, ListBase *dispba
ListBase dlbev;
ListBase nubase = {NULL, NULL};
- BKE_nurbList_duplicate(&nubase, BKE_curve_nurbs_get(cu));
-
BLI_freelistN(&(ob->curve_cache->bev));
if (ob->curve_cache->path) free_path(ob->curve_cache->path);
@@ -1384,6 +1382,8 @@ static void do_makeDispListCurveTypes(Scene *scene, Object *ob, ListBase *dispba
if (ob->type == OB_FONT)
BKE_vfont_to_curve(G.main, scene, ob, 0);
+ BKE_nurbList_duplicate(&nubase, BKE_curve_nurbs_get(cu));
+
if (!forOrco)
curve_calc_modifiers_pre(scene, ob, &nubase, forRender, renderResolution);