[Bf-blender-cvs] [24a97299212] soc-2020-io-performance: Cleanup: comments and rna warning.

Ankit Meel noreply at git.blender.org
Wed Sep 2 20:41:37 CEST 2020


Commit: 24a97299212b4020d96ce6d5931f569bf2aca34d
Author: Ankit Meel
Date:   Wed Sep 2 23:47:22 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rB24a97299212b4020d96ce6d5931f569bf2aca34d

Cleanup: comments and rna warning.

===================================================================

M	source/blender/editors/io/io_obj.c
M	source/blender/io/wavefront_obj/intern/obj_exporter.cc

===================================================================

diff --git a/source/blender/editors/io/io_obj.c b/source/blender/editors/io/io_obj.c
index b52d3d84539..8107ccff1d6 100644
--- a/source/blender/editors/io/io_obj.c
+++ b/source/blender/editors/io/io_obj.c
@@ -333,7 +333,7 @@ void WM_OT_obj_export(struct wmOperatorType *ot)
                   true,
                   "Export Normals",
                   "Export per-face normals if the face is flat-shaded, per-face-per-vertex "
-                  "normals if smooth-shaded.");
+                  "normals if smooth-shaded");
   RNA_def_boolean(ot->srna,
                   "export_materials",
                   true,
diff --git a/source/blender/io/wavefront_obj/intern/obj_exporter.cc b/source/blender/io/wavefront_obj/intern/obj_exporter.cc
index 907c22afd7a..90d284e24cc 100644
--- a/source/blender/io/wavefront_obj/intern/obj_exporter.cc
+++ b/source/blender/io/wavefront_obj/intern/obj_exporter.cc
@@ -128,8 +128,8 @@ static void export_frame(ViewLayer *view_layer,
     frame_writer.write_mtllib(filepath);
   }
   for (int i = 0; i < exportable_as_mesh.size(); i++) {
-    /* Smooth groups and UV vertex indices may take huge memory, so remove objects right
-     * after they're written. */
+    /* Smooth groups and UV vertex indices may take huge memory, so objects should be freed right
+     * after they're written, instead of waiting for Vector to clean up. */
     const std::unique_ptr<OBJMesh> mesh_to_export = std::move(exportable_as_mesh[i]);
     frame_writer.write_object_name(*mesh_to_export);
     frame_writer.write_vertex_coords(*mesh_to_export);
@@ -157,8 +157,8 @@ static void export_frame(ViewLayer *view_layer,
 
   /* Export nurbs in parm form, not as vertices and edges. */
   for (const std::unique_ptr<OBJCurve> &nurbs_to_export : exportable_as_nurbs) {
-    /* Curves don't have any dynamically allocated memory, so it's find to keep them
-     * around till Vector's cleanup. */
+    /* Curves don't have any dynamically allocated memory, so it's fine
+     * to wait for Vector to clean the objects up. */
     frame_writer.write_nurbs_curve(*nurbs_to_export);
   }
 }



More information about the Bf-blender-cvs mailing list