From 20d3ce57d0730999373fcbb0b22696dbfdfa7326 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 7 Jun 2018 17:54:36 +0200 Subject: Alembic export: cleaned up multiply-passed depsgraph & scene Those can now solely be found in the ExportSettings object. --- source/blender/alembic/intern/abc_mball.cc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'source/blender/alembic/intern/abc_mball.cc') diff --git a/source/blender/alembic/intern/abc_mball.cc b/source/blender/alembic/intern/abc_mball.cc index 1df55712abe..d6e54407922 100644 --- a/source/blender/alembic/intern/abc_mball.cc +++ b/source/blender/alembic/intern/abc_mball.cc @@ -42,13 +42,11 @@ extern "C" { AbcMBallWriter::AbcMBallWriter( Main *bmain, - Depsgraph *depsgraph, - Scene *scene, Object *ob, AbcTransformWriter *parent, uint32_t time_sampling, ExportSettings &settings) - : AbcObjectWriter(depsgraph, scene, ob, time_sampling, settings, parent) + : AbcObjectWriter(ob, time_sampling, settings, parent) , m_bmain(bmain) { m_is_animated = isAnimated(); @@ -58,8 +56,7 @@ AbcMBallWriter::AbcMBallWriter( sizeof(CurveCache), "CurveCache for AbcMBallWriter"); - m_mesh_writer = new AbcMeshWriter(depsgraph, scene, m_mesh_ob, parent, - time_sampling, settings); + m_mesh_writer = new AbcMeshWriter(m_mesh_ob, parent, time_sampling, settings); m_mesh_writer->setIsAnimated(m_is_animated); } @@ -101,7 +98,7 @@ void AbcMBallWriter::do_write() * only contains for_render flag. As soon as CoW is * implemented, this is to be rethinked. */ - BKE_displist_make_mball_forRender(m_depsgraph, m_scene, m_object, &disp); + BKE_displist_make_mball_forRender(m_settings.depsgraph, m_settings.scene, m_object, &disp); BKE_mesh_from_metaball(&disp, tmpmesh); BKE_displist_free(&disp); -- cgit v1.2.3