[Bf-blender-cvs] [47166605915] soc-2020-io-performance: Rename exportable_meshes to exportable_as_mesh
Ankit Meel
noreply at git.blender.org
Thu Jul 23 12:41:41 CEST 2020
Commit: 47166605915e08455a31e42aab49b3d56c839237
Author: Ankit Meel
Date: Thu Jul 23 16:11:34 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rB47166605915e08455a31e42aab49b3d56c839237
Rename exportable_meshes to exportable_as_mesh
This change is to make it more clear that this is not a list of
Blender meshes, but objects that are being exported in Mesh form.
Same for NURBS curve.
===================================================================
M source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
===================================================================
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 e9fb3601934..1da7c37a40f 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
@@ -118,17 +118,17 @@ static void export_frame(ViewLayer *view_layer,
}
/* Meshes, and curves to be exported in mesh form. */
- Vector<std::unique_ptr<OBJMesh>> exportable_meshes;
+ Vector<std::unique_ptr<OBJMesh>> exportable_as_mesh;
/* NURBS to be exported in parameter form. */
- Vector<std::unique_ptr<OBJNurbs>> exportable_nurbs;
+ Vector<std::unique_ptr<OBJNurbs>> exportable_as_nurbs;
find_exportable_objects(
- view_layer, depsgraph, export_params, exportable_meshes, exportable_nurbs);
+ view_layer, depsgraph, export_params, exportable_as_mesh, exportable_as_nurbs);
if (export_params.export_materials) {
/* Create an empty MTL file in the beginning, to be appended later. */
frame_writer.write_mtllib(filepath);
}
- for (std::unique_ptr<OBJMesh> &mesh_to_export : exportable_meshes) {
+ for (std::unique_ptr<OBJMesh> &mesh_to_export : exportable_as_mesh) {
frame_writer.write_object_name(*mesh_to_export);
frame_writer.write_vertex_coords(*mesh_to_export);
@@ -153,7 +153,7 @@ static void export_frame(ViewLayer *view_layer,
frame_writer.update_index_offsets(*mesh_to_export);
}
/* Export nurbs in parm form, not as vertices and edges. */
- for (std::unique_ptr<OBJNurbs> &nurbs_to_export : exportable_nurbs) {
+ for (std::unique_ptr<OBJNurbs> &nurbs_to_export : exportable_as_nurbs) {
frame_writer.write_nurbs_curve(*nurbs_to_export);
}
}
More information about the Bf-blender-cvs
mailing list