[Bf-blender-cvs] [d0dcf426b09] usd-importer-T81257-merge: USD Import: enforcing const correctness.
makowalski
noreply at git.blender.org
Fri Mar 12 07:25:52 CET 2021
Commit: d0dcf426b09cc03a1911a7d79cdfe277195b658b
Author: makowalski
Date: Thu Mar 11 23:31:23 2021 -0500
Branches: usd-importer-T81257-merge
https://developer.blender.org/rBd0dcf426b09cc03a1911a7d79cdfe277195b658b
USD Import: enforcing const correctness.
===================================================================
M source/blender/io/usd/intern/usd_reader_camera.h
M source/blender/io/usd/intern/usd_reader_curve.h
M source/blender/io/usd/intern/usd_reader_geom.h
M source/blender/io/usd/intern/usd_reader_instance.cc
M source/blender/io/usd/intern/usd_reader_instance.h
M source/blender/io/usd/intern/usd_reader_light.h
M source/blender/io/usd/intern/usd_reader_mesh.cc
M source/blender/io/usd/intern/usd_reader_mesh.h
M source/blender/io/usd/intern/usd_reader_nurbs.h
M source/blender/io/usd/intern/usd_reader_prim.cc
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_stage.h
M source/blender/io/usd/intern/usd_reader_volume.h
M source/blender/io/usd/intern/usd_reader_xform.h
===================================================================
diff --git a/source/blender/io/usd/intern/usd_reader_camera.h b/source/blender/io/usd/intern/usd_reader_camera.h
index c5a7b1d5561..9f952047b2c 100644
--- a/source/blender/io/usd/intern/usd_reader_camera.h
+++ b/source/blender/io/usd/intern/usd_reader_camera.h
@@ -25,7 +25,7 @@ class USDCameraReader : public USDXformReader {
public:
USDCameraReader(const pxr::UsdPrim &object,
const USDImportParams &import_params,
- ImportSettings &settings)
+ const ImportSettings &settings)
: USDXformReader(object, import_params, settings)
{
}
diff --git a/source/blender/io/usd/intern/usd_reader_curve.h b/source/blender/io/usd/intern/usd_reader_curve.h
index a54d15ea8a6..98939fb6f8b 100644
--- a/source/blender/io/usd/intern/usd_reader_curve.h
+++ b/source/blender/io/usd/intern/usd_reader_curve.h
@@ -32,7 +32,7 @@ class USDCurvesReader : public USDGeomReader {
public:
USDCurvesReader(const pxr::UsdPrim &object,
const USDImportParams &import_params,
- ImportSettings &settings)
+ const ImportSettings &settings)
: USDGeomReader(object, import_params, settings)
{
}
diff --git a/source/blender/io/usd/intern/usd_reader_geom.h b/source/blender/io/usd/intern/usd_reader_geom.h
index dd5796c697d..7fb581adb79 100644
--- a/source/blender/io/usd/intern/usd_reader_geom.h
+++ b/source/blender/io/usd/intern/usd_reader_geom.h
@@ -27,7 +27,7 @@ class USDGeomReader : public USDXformReader {
public:
USDGeomReader(const pxr::UsdPrim &object,
const USDImportParams &import_params,
- ImportSettings &settings)
+ const ImportSettings &settings)
: USDXformReader(object, import_params, settings)
{
}
diff --git a/source/blender/io/usd/intern/usd_reader_instance.cc b/source/blender/io/usd/intern/usd_reader_instance.cc
index b4dc88dfad6..0ccae738440 100644
--- a/source/blender/io/usd/intern/usd_reader_instance.cc
+++ b/source/blender/io/usd/intern/usd_reader_instance.cc
@@ -28,7 +28,7 @@ namespace blender::io::usd {
USDInstanceReader::USDInstanceReader(const pxr::UsdPrim &object,
const USDImportParams &import_params,
- ImportSettings &settings)
+ const ImportSettings &settings)
: USDXformReader(object, import_params, settings)
{
}
diff --git a/source/blender/io/usd/intern/usd_reader_instance.h b/source/blender/io/usd/intern/usd_reader_instance.h
index 5cc04a04e94..56154a685af 100644
--- a/source/blender/io/usd/intern/usd_reader_instance.h
+++ b/source/blender/io/usd/intern/usd_reader_instance.h
@@ -33,7 +33,7 @@ class USDInstanceReader : public USDXformReader {
public:
USDInstanceReader(const pxr::UsdPrim &object,
const USDImportParams &import_params,
- ImportSettings &settings);
+ const ImportSettings &settings);
bool valid() const override;
diff --git a/source/blender/io/usd/intern/usd_reader_light.h b/source/blender/io/usd/intern/usd_reader_light.h
index f721f220e35..3aaf4bbc60c 100644
--- a/source/blender/io/usd/intern/usd_reader_light.h
+++ b/source/blender/io/usd/intern/usd_reader_light.h
@@ -25,7 +25,7 @@ class USDLightReader : public USDXformReader {
public:
USDLightReader(const pxr::UsdPrim &object,
const USDImportParams &import_params,
- ImportSettings &settings)
+ const ImportSettings &settings)
: USDXformReader(object, import_params, settings)
{
}
diff --git a/source/blender/io/usd/intern/usd_reader_mesh.cc b/source/blender/io/usd/intern/usd_reader_mesh.cc
index e6b52775d06..7ebfe3fa984 100644
--- a/source/blender/io/usd/intern/usd_reader_mesh.cc
+++ b/source/blender/io/usd/intern/usd_reader_mesh.cc
@@ -187,7 +187,7 @@ namespace blender::io::usd {
USDMeshReader::USDMeshReader(const pxr::UsdPrim &object,
const USDImportParams &import_params,
- ImportSettings &settings)
+ const ImportSettings &settings)
: USDGeomReader(object, import_params, settings),
is_left_handed_(false),
last_num_positions_(-1),
diff --git a/source/blender/io/usd/intern/usd_reader_mesh.h b/source/blender/io/usd/intern/usd_reader_mesh.h
index e7564b424d8..ce2f5183437 100644
--- a/source/blender/io/usd/intern/usd_reader_mesh.h
+++ b/source/blender/io/usd/intern/usd_reader_mesh.h
@@ -50,7 +50,7 @@ class USDMeshReader : public USDGeomReader {
public:
USDMeshReader(const pxr::UsdPrim &object,
const USDImportParams &import_params,
- ImportSettings &settings);
+ const ImportSettings &settings);
bool valid() const override;
diff --git a/source/blender/io/usd/intern/usd_reader_nurbs.h b/source/blender/io/usd/intern/usd_reader_nurbs.h
index 8a768d55efb..b25419d925f 100644
--- a/source/blender/io/usd/intern/usd_reader_nurbs.h
+++ b/source/blender/io/usd/intern/usd_reader_nurbs.h
@@ -32,7 +32,7 @@ class USDNurbsReader : public USDGeomReader {
public:
USDNurbsReader(const pxr::UsdPrim &object,
const USDImportParams &import_params,
- ImportSettings &settings)
+ const ImportSettings &settings)
: USDGeomReader(object, import_params, settings)
{
}
diff --git a/source/blender/io/usd/intern/usd_reader_prim.cc b/source/blender/io/usd/intern/usd_reader_prim.cc
index 9300752f9b7..0a8eb16c693 100644
--- a/source/blender/io/usd/intern/usd_reader_prim.cc
+++ b/source/blender/io/usd/intern/usd_reader_prim.cc
@@ -40,7 +40,7 @@ namespace blender::io::usd {
USDPrimReader::USDPrimReader(const pxr::UsdPrim &object,
const USDImportParams &import_params,
- ImportSettings &settings)
+ const ImportSettings &settings)
: name_(object.GetName().GetString()),
prim_path_(object.GetPrimPath().GetString()),
object_(nullptr),
diff --git a/source/blender/io/usd/intern/usd_reader_prim.h b/source/blender/io/usd/intern/usd_reader_prim.h
index 6eefaf9539f..82ddf1f3c8f 100644
--- a/source/blender/io/usd/intern/usd_reader_prim.h
+++ b/source/blender/io/usd/intern/usd_reader_prim.h
@@ -87,13 +87,13 @@ class USDPrimReader {
pxr::UsdPrim prim_;
const USDImportParams &import_params_;
USDPrimReader *parent_reader_;
- ImportSettings *settings_;
+ const ImportSettings *settings_;
int refcount_;
public:
USDPrimReader(const pxr::UsdPrim &object,
const USDImportParams &import_params,
- ImportSettings &settings);
+ const ImportSettings &settings);
virtual ~USDPrimReader();
const pxr::UsdPrim &prim() const;
diff --git a/source/blender/io/usd/intern/usd_reader_stage.cc b/source/blender/io/usd/intern/usd_reader_stage.cc
index e8b1f570998..b8e802f0f1c 100644
--- a/source/blender/io/usd/intern/usd_reader_stage.cc
+++ b/source/blender/io/usd/intern/usd_reader_stage.cc
@@ -86,7 +86,7 @@ bool USDStageReader::valid() const
USDPrimReader *USDStageReader::create_reader(const pxr::UsdPrim &prim,
const USDImportParams ¶ms,
- ImportSettings &settings)
+ const ImportSettings &settings)
{
USDPrimReader *reader = nullptr;
@@ -119,7 +119,7 @@ USDPrimReader *USDStageReader::create_reader(const pxr::UsdPrim &prim,
}
// TODO(makowalski): The handle does not have the proper import params or settings
-USDPrimReader *USDStageReader::create_reader(class USDStageReader *archive,
+USDPrimReader *USDStageReader::create_reader(const USDStageReader *archive,
const pxr::UsdPrim &prim)
{
USDPrimReader *reader = nullptr;
@@ -195,7 +195,7 @@ static USDPrimReader *_handlePrim(Main *bmain,
pxr::UsdPrim prim,
USDPrimReader *parent_reader,
std::vector<USDPrimReader *> &readers,
- ImportSettings &settings)
+ const ImportSettings &settings)
{
if (prim.IsA<pxr::UsdGeomImageable>()) {
pxr::UsdGeomImageable imageable(prim);
@@ -243,7 +243,7 @@ static USDPrimReader *_handlePrim(Main *bmain,
void USDStageReader::collect_readers(Main *bmain,
const USDImportParams ¶ms,
- ImportSettings &settings)
+ const ImportSettings &settings)
{
params_ = params;
settings_ = settings;
diff --git a/source/blender/io/usd/intern/usd_reader_stage.h b/source/blender/io/usd/intern/usd_reader_stage.h
index a41b6bc375d..c683fec197e 100644
--- a/source/blender/io/usd/intern/usd_reader_stage.h
+++ b/source/blender/io/usd/intern/usd_reader_stage.h
@@ -54,16 +54,16 @@ class USDStageReader {
static USDPrimReader *create_reader(const pxr::UsdPrim &prim,
const USDImportParams ¶ms,
- ImportSettings &settings);
+ const ImportSettings &settings);
// This version of create_reader() does not filter by primitive type. I.e.,
// it will convert any prim to a reader, if possible, regardless of the
// primitive types specified by the user in the import options.
- static USDPrimReader *create_reader(class USDStageReader *archive, const pxr::UsdPrim &prim);
+ static USDPrimReader *create_reader(const USDStageReader *archive, const pxr::UsdPrim &prim);
void collect_readers(struct Main *bmain,
const USDImportParams ¶ms,
- ImportSettings &settings);
+ const ImportSettings &settings);
bool valid() const;
@@ -71,20 +71,21 @@ class USDStageReader {
{
return stage_;
}
- USDImportParams ¶ms()
+ const USDImportParams ¶ms() const
{
return params_;
}
- Impo
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list