diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-31 17:44:05 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-31 17:44:05 +0300 |
| commit | da11e33b26b6579ef36c97de1b6fbc0eb02a0b69 (patch) | |
| tree | da13c4b1971e26c0659c2dd218eeb6f42887178a /source/blender/render | |
| parent | 16100f8261770e367b0892bb38c778699ed609fe (diff) | |
Cleanup: remove G.main from BKE mball code.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 52cd5c3449e..0b68802decc 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -2184,7 +2184,7 @@ static void init_render_mball(Render *re, ObjectRen *obr) int a, need_orco, vlakindex, *index, negative_scale; ListBase dispbase= {NULL, NULL}; - if (ob!=BKE_mball_basis_find(re->scene, ob)) + if (ob!=BKE_mball_basis_find(re->eval_ctx, re->scene, ob)) return; mul_m4_m4m4(mat, re->viewmat, ob->obmat); @@ -4862,7 +4862,7 @@ static int allow_render_object(Render *re, Object *ob, int nolamps, int onlysele } /* don't add non-basic meta objects, ends up having renderobjects with no geometry */ - if (ob->type == OB_MBALL && ob!=BKE_mball_basis_find(re->scene, ob)) + if (ob->type == OB_MBALL && ob!=BKE_mball_basis_find(re->eval_ctx, re->scene, ob)) return 0; if (nolamps && (ob->type==OB_LAMP)) |