[Bf-blender-cvs] [df6fe191a98] soc-2020-io-performance: Remove commented-out code; correct spelling.
Ankit Meel
noreply at git.blender.org
Fri Nov 20 10:35:55 CET 2020
Commit: df6fe191a98e015c7db0c59a4335ad9a62205098
Author: Ankit Meel
Date: Fri Nov 20 15:05:41 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rBdf6fe191a98e015c7db0c59a4335ad9a62205098
Remove commented-out code; correct spelling.
===================================================================
M source/blender/io/wavefront_obj/exporter/obj_export_file_writer.cc
M source/blender/io/wavefront_obj/exporter/obj_exporter.cc
===================================================================
diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.cc b/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.cc
index 2fd0b3c918d..3720a41080e 100644
--- a/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.cc
+++ b/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.cc
@@ -220,7 +220,7 @@ void OBJWriter::write_uv_coords(OBJMesh &r_obj_mesh_data) const
}
/**
- * Write loop normals for smooth-shaded polygons, and polygon normals otherwise, as vn x y z .
+ * Write loop normals for smooth-shaded polygons, and polygon normals otherwise, as "vn x y z".
*/
void OBJWriter::write_poly_normals(const OBJMesh &obj_mesh_data) const
{
@@ -584,7 +584,7 @@ void MTLWriter::append_materials(const OBJMesh &mesh_to_export)
for (const MTLMaterial &mtl_material : mtl_materials) {
fprintf(mtl_outfile_, "\nnewmtl %s\n", mtl_material.name.c_str());
- /* At least one material property has not been modified since its initialisation. */
+ /* At least one material property has not been modified since its initialization. */
BLI_assert(all_items_positive({mtl_material.d, mtl_material.Ns, mtl_material.Ni}) &&
mtl_material.illum > 0);
BLI_assert(all_items_positive(mtl_material.Ka) && all_items_positive(mtl_material.Kd) &&
diff --git a/source/blender/io/wavefront_obj/exporter/obj_exporter.cc b/source/blender/io/wavefront_obj/exporter/obj_exporter.cc
index d233b113ed6..667b25d0068 100644
--- a/source/blender/io/wavefront_obj/exporter/obj_exporter.cc
+++ b/source/blender/io/wavefront_obj/exporter/obj_exporter.cc
@@ -207,11 +207,6 @@ static void export_frame(Depsgraph *depsgraph,
if (!frame_writer.init_writer(filepath)) {
return;
}
- //
- // /* Meshes, and curves to be exported in mesh form. */
- // Vector<std::unique_ptr<OBJMesh>> exportable_as_mesh;
- // /* NURBS to be exported in parameter form. */
- // Vector<std::unique_ptr<OBJCurve>> exportable_as_nurbs;
auto [exportable_as_mesh, exportable_as_nurbs] = filter_supported_objects(depsgraph,
export_params);
More information about the Bf-blender-cvs
mailing list