[Bf-blender-cvs] [fdac45d68e9] soc-2020-io-performance: Remove redundant call to OBJMesh destructor.
Ankit Meel
noreply at git.blender.org
Tue Jun 30 08:28:49 CEST 2020
Commit: fdac45d68e95b0401f7b3156facbcc212062e171
Author: Ankit Meel
Date: Tue Jun 30 11:58:42 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rBfdac45d68e95b0401f7b3156facbcc212062e171
Remove redundant call to OBJMesh destructor.
===================================================================
M source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
M source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.hh
===================================================================
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
index 94121677aeb..3cf3ef9e0ed 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
@@ -121,8 +121,6 @@ static void export_frame(bContext *C, const OBJExportParams *export_params, cons
frame_writer.write_poly_indices(mesh_to_export, uv_indices);
}
frame_writer.update_index_offsets(mesh_to_export);
-
- mesh_to_export.~OBJMesh();
}
/* Export nurbs in parm form, not as vertices and edges. */
for (uint ob_iter = 0; ob_iter < exportable_nurbs.size(); ob_iter++) {
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.hh b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.hh
index bb5e7b99930..b393c369f98 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.hh
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.hh
@@ -48,7 +48,9 @@ class OBJMesh {
/** Free new meshes we allocate for triangulated meshes, and curves converted to meshes. */
~OBJMesh()
{
+ /** TODO ankitm remove this debug fprintf. */
if (_me_eval_needs_free) {
+ fprintf(stderr, "Freed a curve converted to mesh at\n%s\n", AT);
BKE_id_free(NULL, _export_mesh_eval);
}
}
More information about the Bf-blender-cvs
mailing list