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/blenkernel/intern/mesh_convert.c | |
| 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/blenkernel/intern/mesh_convert.c')
| -rw-r--r-- | source/blender/blenkernel/intern/mesh_convert.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/mesh_convert.c b/source/blender/blenkernel/intern/mesh_convert.c index 81aeabd2f5c..e9ef7638da3 100644 --- a/source/blender/blenkernel/intern/mesh_convert.c +++ b/source/blender/blenkernel/intern/mesh_convert.c @@ -876,7 +876,7 @@ Mesh *BKE_mesh_new_from_object( case OB_MBALL: { /* metaballs don't have modifiers, so just convert to mesh */ - Object *basis_ob = BKE_mball_basis_find(bmain->eval_ctx, sce, ob); + Object *basis_ob = BKE_mball_basis_find(bmain, bmain->eval_ctx, sce, ob); /* todo, re-generatre for render-res */ /* metaball_polygonize(scene, ob) */ @@ -895,7 +895,7 @@ Mesh *BKE_mesh_new_from_object( */ EvaluationContext eval_ctx; DEG_evaluation_context_init(&eval_ctx, DAG_EVAL_RENDER); - BKE_displist_make_mball_forRender(&eval_ctx, sce, ob, &disp); + BKE_displist_make_mball_forRender(bmain, &eval_ctx, sce, ob, &disp); BKE_mesh_from_metaball(&disp, tmpmesh); BKE_displist_free(&disp); } |