diff options
Diffstat (limited to 'source/blender/collada/GeometryExporter.cpp')
| -rw-r--r-- | source/blender/collada/GeometryExporter.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/collada/GeometryExporter.cpp b/source/blender/collada/GeometryExporter.cpp index 928509cbef9..f4ea82044a3 100644 --- a/source/blender/collada/GeometryExporter.cpp +++ b/source/blender/collada/GeometryExporter.cpp @@ -51,17 +51,17 @@ extern "C" { #include "collada_utils.h" // TODO: optimize UV sets by making indexed list with duplicates removed -GeometryExporter::GeometryExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings) : COLLADASW::LibraryGeometries(sw), export_settings(export_settings) +GeometryExporter::GeometryExporter(BlenderContext &blender_context, COLLADASW::StreamWriter *sw, const ExportSettings *export_settings) : + blender_context(blender_context), + COLLADASW::LibraryGeometries(sw), export_settings(export_settings) { } -void GeometryExporter::exportGeom(Main *bmain, struct Depsgraph *depsgraph, Scene *sce) +void GeometryExporter::exportGeom() { + Scene *sce = blender_context.get_scene(); openLibrary(); - mDepsgraph = depsgraph; - m_bmain = bmain; - mScene = sce; GeometryFunctor gf; gf.forEachMeshObjectInExportSet<GeometryExporter>(sce, *this, this->export_settings->export_set); @@ -72,8 +72,7 @@ void GeometryExporter::operator()(Object *ob) { bool use_instantiation = this->export_settings->use_object_instantiation; Mesh *me = bc_get_mesh_copy( - mDepsgraph, - mScene, + blender_context, ob, this->export_settings->export_mesh_type, this->export_settings->apply_modifiers, @@ -91,6 +90,7 @@ void GeometryExporter::operator()(Object *ob) } std::string geom_name = (use_instantiation) ? id_name(ob->data) : id_name(ob); + geom_name = encode_xml(geom_name); exportedGeometry.insert(geom_id); |