diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-11 13:14:18 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-11 13:15:14 +0300 |
commit | d0956e9cb3077971a9ae6c1ba9560604d5ad1ef7 (patch) | |
tree | 0dea964abf85748db7ab15a2feee1a41bf6ec52c /source/blender/render/intern | |
parent | 8055ed2741d1da48f2bf84c75ccb37b54cef1ab8 (diff) |
Cleanup: Moar G.main removal of Hell.
This commit actually adds some G.main... but at much, much higher level
than the ones it removes, so should still be better ;)
Diffstat (limited to 'source/blender/render/intern')
-rw-r--r-- | source/blender/render/intern/source/convertblender.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 8675ffec313..8105f94cb31 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->eval_ctx, re->scene, ob)) + if (ob!=BKE_mball_basis_find(re->main, re->eval_ctx, re->scene, ob)) return; mul_m4_m4m4(mat, re->viewmat, ob->obmat); @@ -2199,7 +2199,7 @@ static void init_render_mball(Render *re, ObjectRen *obr) need_orco= 1; } - BKE_displist_make_mball_forRender(re->eval_ctx, re->scene, ob, &dispbase); + BKE_displist_make_mball_forRender(re->main, re->eval_ctx, re->scene, ob, &dispbase); dl= dispbase.first; if (dl == NULL) return; @@ -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->eval_ctx, re->scene, ob)) + if (ob->type == OB_MBALL && ob != BKE_mball_basis_find(re->main, re->eval_ctx, re->scene, ob)) return 0; if (nolamps && (ob->type==OB_LAMP)) @@ -5049,7 +5049,7 @@ static void database_init_objects(Render *re, unsigned int renderlay, int nolamp /* create list of duplis generated by this object, particle * system need to have render settings set for dupli particles */ dupli_render_particle_set(re, ob, timeoffset, 0, 1); - duplilist = object_duplilist(re->eval_ctx, re->scene, ob); + duplilist = object_duplilist(re->main, re->eval_ctx, re->scene, ob); duplilist_apply_data = duplilist_apply(ob, NULL, duplilist); /* postpone 'dupli_render_particle_set', since RE_addRenderInstance reads * index values from 'dob->persistent_id[0]', referencing 'psys->child' which |