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/alembic | |
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/alembic')
-rw-r--r-- | source/blender/alembic/intern/abc_exporter.cc | 12 | ||||
-rw-r--r-- | source/blender/alembic/intern/abc_mball.cc | 6 | ||||
-rw-r--r-- | source/blender/alembic/intern/abc_mball.h | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/alembic/intern/abc_exporter.cc b/source/blender/alembic/intern/abc_exporter.cc index 67575cb52d5..7e8f4e3cd15 100644 --- a/source/blender/alembic/intern/abc_exporter.cc +++ b/source/blender/alembic/intern/abc_exporter.cc @@ -111,7 +111,7 @@ static bool object_is_smoke_sim(Object *ob) return false; } -static bool object_type_is_exportable(EvaluationContext *eval_ctx, Scene *scene, Object *ob) +static bool object_type_is_exportable(Main *bmain, EvaluationContext *eval_ctx, Scene *scene, Object *ob) { switch (ob->type) { case OB_MESH: @@ -126,7 +126,7 @@ static bool object_type_is_exportable(EvaluationContext *eval_ctx, Scene *scene, case OB_CAMERA: return true; case OB_MBALL: - return AbcMBallWriter::isBasisBall(eval_ctx, scene, ob); + return AbcMBallWriter::isBasisBall(bmain, eval_ctx, scene, ob); default: return false; } @@ -386,11 +386,11 @@ void AbcExporter::exploreTransform(EvaluationContext *eval_ctx, Object *ob, Obje return; } - if (object_type_is_exportable(eval_ctx, m_scene, ob)) { + if (object_type_is_exportable(m_bmain, eval_ctx, m_scene, ob)) { createTransformWriter(ob, parent, dupliObParent); } - ListBase *lb = object_duplilist(eval_ctx, m_scene, ob); + ListBase *lb = object_duplilist(m_bmain, eval_ctx, m_scene, ob); if (lb) { DupliObject *link = static_cast<DupliObject *>(lb->first); @@ -506,7 +506,7 @@ void AbcExporter::exploreObject(EvaluationContext *eval_ctx, Object *ob, Object createShapeWriter(ob, dupliObParent); - ListBase *lb = object_duplilist(eval_ctx, m_scene, ob); + ListBase *lb = object_duplilist(m_bmain, eval_ctx, m_scene, ob); if (lb) { DupliObject *link = static_cast<DupliObject *>(lb->first); @@ -551,7 +551,7 @@ void AbcExporter::createParticleSystemsWriters(Object *ob, AbcTransformWriter *x void AbcExporter::createShapeWriter(Object *ob, Object *dupliObParent) { - if (!object_type_is_exportable(m_bmain->eval_ctx, m_scene, ob)) { + if (!object_type_is_exportable(m_bmain, m_bmain->eval_ctx, m_scene, ob)) { return; } diff --git a/source/blender/alembic/intern/abc_mball.cc b/source/blender/alembic/intern/abc_mball.cc index c5712daf499..05700e6024e 100644 --- a/source/blender/alembic/intern/abc_mball.cc +++ b/source/blender/alembic/intern/abc_mball.cc @@ -103,7 +103,7 @@ void AbcMBallWriter::do_write() */ EvaluationContext eval_ctx; DEG_evaluation_context_init(&eval_ctx, DAG_EVAL_RENDER); - BKE_displist_make_mball_forRender(&eval_ctx, m_scene, m_object, &disp); + BKE_displist_make_mball_forRender(m_bmain, &eval_ctx, m_scene, m_object, &disp); BKE_mesh_from_metaball(&disp, tmpmesh); BKE_displist_free(&disp); @@ -115,8 +115,8 @@ void AbcMBallWriter::do_write() m_mesh_ob->data = NULL; } -bool AbcMBallWriter::isBasisBall(EvaluationContext *eval_ctx, Scene *scene, Object *ob) +bool AbcMBallWriter::isBasisBall(Main *bmain, EvaluationContext *eval_ctx, Scene *scene, Object *ob) { - Object *basis_ob = BKE_mball_basis_find(eval_ctx, scene, ob); + Object *basis_ob = BKE_mball_basis_find(bmain, eval_ctx, scene, ob); return ob == basis_ob; } diff --git a/source/blender/alembic/intern/abc_mball.h b/source/blender/alembic/intern/abc_mball.h index 9a74006f839..46567ff3386 100644 --- a/source/blender/alembic/intern/abc_mball.h +++ b/source/blender/alembic/intern/abc_mball.h @@ -51,7 +51,7 @@ public: ~AbcMBallWriter(); - static bool isBasisBall(EvaluationContext *eval_ctx, Scene *scene, Object *ob); + static bool isBasisBall(Main *bmain, EvaluationContext *eval_ctx, Scene *scene, Object *ob); private: virtual void do_write(); |