archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: remove G.main from BKE mball code.

Browse Source
This commit is contained in:
Bastien Montagne
2018-05-31 16:44:05 +02:00
parent 16100f8261
commit da11e33b26
13 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/render/intern/source/convertblender.c
View File

@@ -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))