diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-01-09 22:03:49 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-01-13 13:57:51 +0400 |
| commit | f86fbc4ea31f743b8a28d4f91dc2eff209740507 (patch) | |
| tree | a41e381399d8a50937fa923fa30feeb24ce372d8 /source/blender/blenkernel/intern/anim.c | |
| parent | 9d882031014abdd6daafe3a1235cd263edbc58fc (diff) | |
Remove direct displist creation from BKE_vfont_to_curve_ex()
This goes back to ancient era again and such a call isn't
safe for threading and really DAG is to make it sure display
list for dependencies is always there.
Diffstat (limited to 'source/blender/blenkernel/intern/anim.c')
| -rw-r--r-- | source/blender/blenkernel/intern/anim.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index b8a6262463c..0d7a1f9b46c 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -1619,7 +1619,7 @@ static Object *find_family_object(const char *family, size_t family_len, unsigne } -static void font_duplilist(ListBase *lb, Scene *scene, Object *par, int persistent_id[MAX_DUPLI_RECUR], int level, short flag) +static void font_duplilist(ListBase *lb, Object *par, int persistent_id[MAX_DUPLI_RECUR], int level, short flag) { GHash *family_gh; Object *ob; @@ -1638,7 +1638,7 @@ static void font_duplilist(ListBase *lb, Scene *scene, Object *par, int persiste /* in par the family name is stored, use this to find the other objects */ - BKE_vfont_to_curve_ex(G.main, scene, par, FO_DUPLI, NULL, + BKE_vfont_to_curve_ex(G.main, par, FO_DUPLI, NULL, &text, &text_len, &text_free, &chartransdata); if (text == NULL || chartransdata == NULL) { @@ -1736,7 +1736,7 @@ static void object_duplilist_recursive(EvaluationContext *eval_ctx, } else if (ob->type == OB_FONT) { if (GS(id->name) == ID_SCE) { /* TODO - support dupligroups */ - font_duplilist(duplilist, scene, ob, persistent_id, level + 1, flag); + font_duplilist(duplilist, ob, persistent_id, level + 1, flag); } } } |