[Bf-blender-cvs] [0ab2c99d2b4] usd-importer-T81257-merge: USD Import: Commented out unused parameters.

makowalski noreply at git.blender.org
Sat May 8 20:01:06 CEST 2021


Commit: 0ab2c99d2b49d1d3ef2ba8ac2d9622d7414725e3
Author: makowalski
Date:   Sat May 8 13:51:52 2021 -0400
Branches: usd-importer-T81257-merge
https://developer.blender.org/rB0ab2c99d2b49d1d3ef2ba8ac2d9622d7414725e3

USD Import: Commented out unused parameters.

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

M	source/blender/io/usd/intern/usd_reader_mesh.cc
M	source/blender/io/usd/intern/usd_reader_nurbs.cc

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

diff --git a/source/blender/io/usd/intern/usd_reader_mesh.cc b/source/blender/io/usd/intern/usd_reader_mesh.cc
index e6a40cfbe02..b35d082727b 100644
--- a/source/blender/io/usd/intern/usd_reader_mesh.cc
+++ b/source/blender/io/usd/intern/usd_reader_mesh.cc
@@ -259,7 +259,7 @@ bool USDMeshReader::valid() const
   return static_cast<bool>(mesh_prim_);
 }
 
-bool USDMeshReader::topology_changed(Mesh *existing_mesh, const double motionSampleTime)
+bool USDMeshReader::topology_changed(Mesh * /* existing_mesh */, const double motionSampleTime)
 {
   /* TODO(makowalski): Is it the best strategy to cache the mesh
    * geometry in this function?  This needs to be revisited. */
@@ -296,7 +296,7 @@ bool USDMeshReader::topology_changed(Mesh *existing_mesh, const double motionSam
 
 void USDMeshReader::read_mpolys(Mesh *mesh,
                                 pxr::UsdGeomMesh mesh_prim_,
-                                const double motionSampleTime)
+                                const double /* motionSampleTime */)
 {
   MPoly *mpolys = mesh->mpoly;
   MLoop *mloops = mesh->mloop;
@@ -448,7 +448,7 @@ void USDMeshReader::read_uvs(Mesh *mesh,
 
 void USDMeshReader::read_colors(Mesh *mesh,
                                 const pxr::UsdGeomMesh &mesh_prim_,
-                                const double motionSampleTime)
+                                const double /* motionSampleTime */)
 {
   if (!(mesh && mesh_prim_ && mesh->totloop > 0)) {
     return;
@@ -624,7 +624,7 @@ void USDMeshReader::process_normals_uniform(Mesh *mesh)
   MEM_freeN(lnors);
 }
 
-void USDMeshReader::read_mesh_sample(const std::string &iobject_full_name,
+void USDMeshReader::read_mesh_sample(const std::string & /* iobject_full_name */,
                                      ImportSettings *settings,
                                      Mesh *mesh,
                                      const pxr::UsdGeomMesh &mesh_prim_,
@@ -678,7 +678,7 @@ void USDMeshReader::read_mesh_sample(const std::string &iobject_full_name,
 
 void USDMeshReader::assign_facesets_to_mpoly(double motionSampleTime,
                                              MPoly *mpoly,
-                                             const int totpoly,
+                                             const int /* totpoly */,
                                              std::map<pxr::SdfPath, int> &r_mat_map)
 {
   /* Find the geom subsets that have bound materials.
diff --git a/source/blender/io/usd/intern/usd_reader_nurbs.cc b/source/blender/io/usd/intern/usd_reader_nurbs.cc
index 26236fa569b..e22ccc0e9dd 100644
--- a/source/blender/io/usd/intern/usd_reader_nurbs.cc
+++ b/source/blender/io/usd/intern/usd_reader_nurbs.cc
@@ -198,7 +198,7 @@ void USDNurbsReader::read_curve_sample(Curve *cu, const double motionSampleTime)
   }
 }
 
-Mesh *USDNurbsReader::read_mesh(struct Mesh *existing_mesh,
+Mesh *USDNurbsReader::read_mesh(struct Mesh * /* existing_mesh */,
                                 const double motionSampleTime,
                                 const int /* read_flag */,
                                 const float /* vel_scale */,



More information about the Bf-blender-cvs mailing list