[Bf-blender-cvs] [0c982f476d6] usd-importer-T81257-merge: USD Import: comment out unused parameters.
makowalski
noreply at git.blender.org
Thu Apr 15 03:02:44 CEST 2021
Commit: 0c982f476d6609a3b7973981827154dae6f6a86a
Author: makowalski
Date: Wed Apr 14 20:54:44 2021 -0400
Branches: usd-importer-T81257-merge
https://developer.blender.org/rB0c982f476d6609a3b7973981827154dae6f6a86a
USD Import: comment out unused parameters.
===================================================================
M source/blender/io/usd/intern/usd_reader_camera.cc
M source/blender/io/usd/intern/usd_reader_curve.cc
M source/blender/io/usd/intern/usd_reader_geom.cc
M source/blender/io/usd/intern/usd_reader_instance.cc
M source/blender/io/usd/intern/usd_reader_light.cc
M source/blender/io/usd/intern/usd_reader_mesh.cc
M source/blender/io/usd/intern/usd_reader_nurbs.cc
M source/blender/io/usd/intern/usd_reader_xform.cc
===================================================================
diff --git a/source/blender/io/usd/intern/usd_reader_camera.cc b/source/blender/io/usd/intern/usd_reader_camera.cc
index a967976cbf2..c2a524f0673 100644
--- a/source/blender/io/usd/intern/usd_reader_camera.cc
+++ b/source/blender/io/usd/intern/usd_reader_camera.cc
@@ -48,7 +48,7 @@ extern "C" {
namespace blender::io::usd {
-void USDCameraReader::create_object(Main *bmain, double motionSampleTime)
+void USDCameraReader::create_object(Main *bmain, double /* motionSampleTime */)
{
Camera *bcam = static_cast<Camera *>(BKE_camera_add(bmain, name_.c_str()));
diff --git a/source/blender/io/usd/intern/usd_reader_curve.cc b/source/blender/io/usd/intern/usd_reader_curve.cc
index 4e7dc129c7b..ab19d098870 100644
--- a/source/blender/io/usd/intern/usd_reader_curve.cc
+++ b/source/blender/io/usd/intern/usd_reader_curve.cc
@@ -59,7 +59,7 @@ extern "C" {
namespace blender::io::usd {
-void USDCurvesReader::create_object(Main *bmain, double motionSampleTime)
+void USDCurvesReader::create_object(Main *bmain, double /* motionSampleTime */)
{
curve_ = BKE_curve_add(bmain, name_.c_str(), OB_CURVE);
diff --git a/source/blender/io/usd/intern/usd_reader_geom.cc b/source/blender/io/usd/intern/usd_reader_geom.cc
index a9a460cf58a..28d66ddd4ca 100644
--- a/source/blender/io/usd/intern/usd_reader_geom.cc
+++ b/source/blender/io/usd/intern/usd_reader_geom.cc
@@ -61,24 +61,24 @@ extern "C" {
namespace blender::io::usd {
-void USDGeomReader::create_object(Main *bmain, double motionSampleTime)
+void USDGeomReader::create_object(Main * /* bmain */, double /* motionSampleTime */)
{
}
-bool USDGeomReader::topology_changed(Mesh *existing_mesh, double motionSampleTime)
+bool USDGeomReader::topology_changed(Mesh * /* existing_mesh */, double /* motionSampleTime */)
{
return true;
}
-void USDGeomReader::read_object_data(Main *bmain, double motionSampleTime)
+void USDGeomReader::read_object_data(Main * /* bmain */, double /* motionSampleTime */)
{
}
-Mesh *USDGeomReader::read_mesh(struct Mesh *existing_mesh,
- double motionSampleTime,
- int read_flag,
- float vel_scale,
- const char **err_str)
+Mesh *USDGeomReader::read_mesh(struct Mesh * /* existing_mesh */,
+ double /* motionSampleTime */,
+ int /* read_flag */,
+ float /* vel_scale */,
+ const char ** /* err_str */)
{
return nullptr;
}
diff --git a/source/blender/io/usd/intern/usd_reader_instance.cc b/source/blender/io/usd/intern/usd_reader_instance.cc
index 6c67c0a403b..c6f380c1670 100644
--- a/source/blender/io/usd/intern/usd_reader_instance.cc
+++ b/source/blender/io/usd/intern/usd_reader_instance.cc
@@ -38,7 +38,7 @@ bool USDInstanceReader::valid() const
return prim_.IsValid() && prim_.IsInstance();
}
-void USDInstanceReader::create_object(Main *bmain, double motionSampleTime)
+void USDInstanceReader::create_object(Main *bmain, double /* motionSampleTime */)
{
this->object_ = BKE_object_add_only_object(bmain, OB_EMPTY, name_.c_str());
this->object_->data = nullptr;
diff --git a/source/blender/io/usd/intern/usd_reader_light.cc b/source/blender/io/usd/intern/usd_reader_light.cc
index 878d1a3dc2d..454f424f9ca 100644
--- a/source/blender/io/usd/intern/usd_reader_light.cc
+++ b/source/blender/io/usd/intern/usd_reader_light.cc
@@ -44,7 +44,7 @@ extern "C" {
namespace blender::io::usd {
-void USDLightReader::create_object(Main *bmain, double motionSampleTime)
+void USDLightReader::create_object(Main *bmain, double /* motionSampleTime */)
{
Light *blight = static_cast<Light *>(BKE_light_add(bmain, name_.c_str()));
diff --git a/source/blender/io/usd/intern/usd_reader_mesh.cc b/source/blender/io/usd/intern/usd_reader_mesh.cc
index 1cee5d8d211..3b883bd170b 100644
--- a/source/blender/io/usd/intern/usd_reader_mesh.cc
+++ b/source/blender/io/usd/intern/usd_reader_mesh.cc
@@ -207,7 +207,7 @@ USDMeshReader::USDMeshReader(const pxr::UsdPrim &prim,
{
}
-void USDMeshReader::create_object(Main *bmain, double motionSampleTime)
+void USDMeshReader::create_object(Main *bmain, double /* motionSampleTime */)
{
Mesh *mesh = BKE_mesh_add(bmain, name_.c_str());
@@ -759,7 +759,7 @@ Mesh *USDMeshReader::read_mesh(Mesh *existing_mesh,
double motionSampleTime,
int read_flag,
float vel_scale,
- const char **err_str)
+ const char ** /* err_str */)
{
if (!mesh_prim_) {
return existing_mesh;
diff --git a/source/blender/io/usd/intern/usd_reader_nurbs.cc b/source/blender/io/usd/intern/usd_reader_nurbs.cc
index 638fe7dfb9c..b7698885f7f 100644
--- a/source/blender/io/usd/intern/usd_reader_nurbs.cc
+++ b/source/blender/io/usd/intern/usd_reader_nurbs.cc
@@ -76,7 +76,7 @@ static bool set_knots(const pxr::VtDoubleArray &knots, float *&nu_knots)
namespace blender::io::usd {
-void USDNurbsReader::create_object(Main *bmain, double motionSampleTime)
+void USDNurbsReader::create_object(Main *bmain, double /* motionSampleTime */)
{
curve_ = BKE_curve_add(bmain, name_.c_str(), OB_CURVE);
@@ -200,9 +200,9 @@ void USDNurbsReader::read_curve_sample(Curve *cu, double motionSampleTime)
Mesh *USDNurbsReader::read_mesh(struct Mesh *existing_mesh,
double motionSampleTime,
- int read_flag,
- float vel_scale,
- const char **err_str)
+ int /* read_flag */,
+ float /* vel_scale */,
+ const char ** /* err_str */)
{
pxr::UsdGeomCurves curve_prim_(prim_);
diff --git a/source/blender/io/usd/intern/usd_reader_xform.cc b/source/blender/io/usd/intern/usd_reader_xform.cc
index 553e10a620f..3d6dd07ebaa 100644
--- a/source/blender/io/usd/intern/usd_reader_xform.cc
+++ b/source/blender/io/usd/intern/usd_reader_xform.cc
@@ -48,14 +48,14 @@ extern "C" {
namespace blender::io::usd {
-void USDXformReader::create_object(Main *bmain, double motionSampleTime)
+void USDXformReader::create_object(Main *bmain, double /* motionSampleTime */)
{
object_ = BKE_object_add_only_object(bmain, OB_EMPTY, name_.c_str());
object_->empty_drawsize = 0.1f;
object_->data = NULL;
}
-void USDXformReader::read_object_data(Main *bmain, double motionSampleTime)
+void USDXformReader::read_object_data(Main * /* bmain */, double motionSampleTime)
{
bool is_constant;
float transform_from_usd[4][4];
More information about the Bf-blender-cvs
mailing list