From a59d7374ea1ce165604975a807fb6e92f9c1d469 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Sun, 24 Jun 2018 18:40:52 +0200 Subject: Nuke DM out of collada code. Also, now use out-of-main temp copy of mesh for export, and fixed a potential memleak (return without freeing temp copy of mesh, tsst). --- source/blender/collada/GeometryExporter.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'source/blender/collada/GeometryExporter.cpp') diff --git a/source/blender/collada/GeometryExporter.cpp b/source/blender/collada/GeometryExporter.cpp index f59be97b545..fae1fc048c8 100644 --- a/source/blender/collada/GeometryExporter.cpp +++ b/source/blender/collada/GeometryExporter.cpp @@ -40,7 +40,6 @@ extern "C" { #include "BLI_utildefines.h" - #include "BKE_DerivedMesh.h" #include "BKE_main.h" #include "BKE_global.h" #include "BKE_library.h" @@ -72,14 +71,8 @@ void GeometryExporter::exportGeom(Main *bmain, struct Depsgraph *depsgraph, Scen void GeometryExporter::operator()(Object *ob) { - // XXX don't use DerivedMesh, Mesh instead? -#if 0 - DerivedMesh *dm = mesh_get_derived_final(mScene, ob, CD_MASK_BAREMESH); -#endif - bool use_instantiation = this->export_settings->use_object_instantiation; Mesh *me = bc_get_mesh_copy( - m_bmain, mDepsgraph, mScene, ob, @@ -170,8 +163,7 @@ void GeometryExporter::operator()(Object *ob) } } - BKE_libblock_free_us(m_bmain, me); - + BKE_id_free(NULL, me); } void GeometryExporter::export_key_mesh(Object *ob, Mesh *me, KeyBlock *kb) -- cgit v1.2.3