diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-12-20 07:06:22 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-12-20 07:06:22 +0300 |
| commit | 3143b2f9424a10b1baf960c6a0bbb274cdeffe1d (patch) | |
| tree | 9d2095cc94207268aa0160a34db0eb27317e5af7 /source/blender/blenkernel/intern/object_dupli.c | |
| parent | b3bcbc9e85aaad3c6262e8203c69d4089d5d8154 (diff) | |
| parent | 51f0c3fadf085b087a9f98a59db41af6aa632a57 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/object_dupli.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object_dupli.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c index 9b25a1db6ff..13589866e48 100644 --- a/source/blender/blenkernel/intern/object_dupli.c +++ b/source/blender/blenkernel/intern/object_dupli.c @@ -613,7 +613,7 @@ static void make_duplis_font(const DupliContext *ctx) /* in par the family name is stored, use this to find the other objects */ - BKE_vfont_to_curve_ex(G.main, par, FO_DUPLI, NULL, + BKE_vfont_to_curve_ex(G.main, par, par->data, FO_DUPLI, NULL, &text, &text_len, &text_free, &chartransdata); if (text == NULL || chartransdata == NULL) { |