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

Cleanup: remove last G.main's from Collada code.

Browse Source
This commit is contained in:
Bastien Montagne
2018-06-14 15:15:51 +02:00
parent 66407e15cb
commit fd19069999
16 changed files with 92 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/collada/GeometryExporter.cpp
View File

@@ -58,10 +58,11 @@ GeometryExporter::GeometryExporter(COLLADASW::StreamWriter *sw, const ExportSett
{
}
void GeometryExporter::exportGeom(Scene *sce)
void GeometryExporter::exportGeom(Main *bmain, Scene *sce)
{
openLibrary();
m_bmain = bmain;
mScene = sce;
GeometryFunctor gf;
gf.forEachMeshObjectInExportSet<GeometryExporter>(sce, *this, this->export_settings->export_set);
@@ -77,7 +78,9 @@ void GeometryExporter::operator()(Object *ob)
#endif
bool use_instantiation = this->export_settings->use_object_instantiation;
Mesh *me = bc_get_mesh_copy( mScene,
Mesh *me = bc_get_mesh_copy(
m_bmain,
mScene,
ob,
this->export_settings->export_mesh_type,
this->export_settings->apply_modifiers,
@@ -175,7 +178,7 @@ void GeometryExporter::operator()(Object *ob)
}
}
BKE_libblock_free_us(G.main, me);
BKE_libblock_free_us(m_bmain, me);
}