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:
authorBastien Montagne <montagne29@wanadoo.fr>2018-06-12 16:03:51 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-06-12 16:03:51 +0300
commitd617a6c85b4874a81d86568d00b56f2bda11c4b4 (patch)
tree23336dbb317a3fcc0294728521e19d7f3ba6cb9c /source/blender/blenkernel/intern/object_dupli.c
parentbe57cf9b2a0e1be577211839487cacd288886c1a (diff)
Cleanup/simplify G.main usages.
Using G.main only to get main bled filepath, or built-in fonts, is OK. So now using the 'valid' G_MAIN macro here instead.
Diffstat (limited to 'source/blender/blenkernel/intern/object_dupli.c')
-rw-r--r--source/blender/blenkernel/intern/object_dupli.c2
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 19450b88947..97d2280c021 100644
--- a/source/blender/blenkernel/intern/object_dupli.c
+++ b/source/blender/blenkernel/intern/object_dupli.c
@@ -634,7 +634,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, par->data, FO_DUPLI, NULL,
+ BKE_vfont_to_curve_ex(par, par->data, FO_DUPLI, NULL,
&text, &text_len, &text_free, &chartransdata);
if (text == NULL || chartransdata == NULL) {