[Bf-blender-cvs] [aace63c3424] usd-importer-T81257-merge: USD import: fix comments.

[makowalski]

Commit: aace63c34245e827810be22600e051a0c6bb9e7d
Author: makowalski
Date:   Fri Jul 23 18:08:17 2021 -0400
Branches: usd-importer-T81257-merge
https://developer.blender.org/rBaace63c34245e827810be22600e051a0c6bb9e7d

USD import: fix comments.

Updated to C-style comments.  Minor cleanup of
comments text.

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

M	source/blender/io/usd/intern/usd_reader_mesh.h
M	source/blender/io/usd/intern/usd_reader_prim.h
M	source/blender/io/usd/intern/usd_reader_stage.cc
M	source/blender/io/usd/intern/usd_reader_xform.cc

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

diff --git a/source/blender/io/usd/intern/usd_reader_mesh.h b/source/blender/io/usd/intern/usd_reader_mesh.h
index ae84f0d575f..c95c4198fb5 100644
--- a/source/blender/io/usd/intern/usd_reader_mesh.h
+++ b/source/blender/io/usd/intern/usd_reader_mesh.h
@@ -46,9 +46,9 @@ class USDMeshReader : public USDGeomReader {
   bool has_uvs_;
   bool is_time_varying_;
 
-  // This is to ensure we load all data once because we reuse the read_mesh function
-  // in the mesh seq modifier, and in initial load. Ideally a better fix would be
-  // implemented. Note this will break if face or positions vary...
+  /* This is to ensure we load all data once, because we reuse the read_mesh function
+   * in the mesh seq modifier, and in initial load. Ideally, a better fix would be
+   * implemented.  Note this will break if faces or positions vary. */
   bool is_initial_load_;
 
  public:
diff --git a/source/blender/io/usd/intern/usd_reader_prim.h b/source/blender/io/usd/intern/usd_reader_prim.h
index 4af363cff53..4c9eace6fe8 100644
--- a/source/blender/io/usd/intern/usd_reader_prim.h
+++ b/source/blender/io/usd/intern/usd_reader_prim.h
@@ -61,7 +61,7 @@ struct ImportSettings {
   }
 };
 
-// Most generic USD Reader
+/* Most generic USD Reader. */
 
 class USDPrimReader {
 
diff --git a/source/blender/io/usd/intern/usd_reader_stage.cc b/source/blender/io/usd/intern/usd_reader_stage.cc
index b98caea0f30..4a66b6b8a88 100644
--- a/source/blender/io/usd/intern/usd_reader_stage.cc
+++ b/source/blender/io/usd/intern/usd_reader_stage.cc
@@ -284,7 +284,7 @@ void USDStageReader::collect_readers(Main *bmain)
 
   clear_readers();
 
-  // Iterate through stage
+  /* Iterate through the stage. */
   pxr::UsdPrim root = stage_->GetPseudoRoot();
 
   std::string prim_path_mask(params_.prim_path_mask);
diff --git a/source/blender/io/usd/intern/usd_reader_xform.cc b/source/blender/io/usd/intern/usd_reader_xform.cc
index 9fb97f55bfe..2041349931c 100644
--- a/source/blender/io/usd/intern/usd_reader_xform.cc
+++ b/source/blender/io/usd/intern/usd_reader_xform.cc
@@ -88,7 +88,7 @@ void USDXformReader::read_matrix(float r_mat[4][4] /* local matrix */,
   }
 
   if (!xformable) {
-    // This might happen if the prim is a Scope.
+    /* This might happen if the prim is a Scope. */
     return;
   }
 
@@ -98,7 +98,7 @@ void USDXformReader::read_matrix(float r_mat[4][4] /* local matrix */,
   bool reset_xform_stack;
   xformable.GetLocalTransformation(&usd_local_xf, &reset_xform_stack, time);
 
-  // Convert the result to a float matrix.
+  /* Convert the result to a float matrix. */
   pxr::GfMatrix4f mat4f = pxr::GfMatrix4f(usd_local_xf);
   mat4f.Get(r_mat);
 
@@ -123,7 +123,7 @@ bool USDXformReader::prim_has_xform_ops() const
   pxr::UsdGeomXformable xformable(prim_);
 
   if (!xformable) {
-    // This might happen if the prim is a Scope.
+    /* This might happen if the prim is a Scope. */
     return false;
   }
 
@@ -139,9 +139,9 @@ bool USDXformReader::is_root_xform_prim() const
   }
 
   if (prim_.IsInMaster()) {
-    // We don't consider prototypes to be root prims,
-    // because we never want to apply global scaling
-    // or rotations to the prototypes themselves.
+    /* We don't consider prototypes to be root prims,
+     * because we never want to apply global scaling
+     * or rotations to the prototypes themselves. */
     return false;
   }