diff options
| author | Michael Kowalski <makowalski@nvidia.com> | 2022-05-02 03:33:48 +0300 |
|---|---|---|
| committer | Michael Kowalski <makowalski@nvidia.com> | 2022-05-02 03:33:48 +0300 |
| commit | 93a9e201f107cb0f4eff5e475096c4105ac0cb96 (patch) | |
| tree | 9d0a0ca1dd74f2f81760fa32f7b327469fef7d0b | |
| parent | e0f6dcfc3c8f4fd873032928e6de08957b6455c6 (diff) | |
Fixed USD 21.11 compile errors.
| -rw-r--r-- | source/blender/io/usd/intern/usd_reader_instance.cc | 4 | ||||
| -rw-r--r-- | source/blender/io/usd/intern/usd_reader_light.cc | 1 | ||||
| -rw-r--r-- | source/blender/io/usd/intern/usd_reader_stage.cc | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/io/usd/intern/usd_reader_instance.cc b/source/blender/io/usd/intern/usd_reader_instance.cc index 5ee4cc7e9a7..070ad47a872 100644 --- a/source/blender/io/usd/intern/usd_reader_instance.cc +++ b/source/blender/io/usd/intern/usd_reader_instance.cc @@ -54,8 +54,8 @@ void USDInstanceReader::set_instance_collection(Collection *coll) pxr::SdfPath USDInstanceReader::proto_path() const { - if (pxr::UsdPrim master = prim_.GetMaster()) { - return master.GetPath(); + if (pxr::UsdPrim proto = prim_.GetPrototype()) { + return proto.GetPath(); } return pxr::SdfPath(); diff --git a/source/blender/io/usd/intern/usd_reader_light.cc b/source/blender/io/usd/intern/usd_reader_light.cc index 97eb9ca076f..2fac35735b6 100644 --- a/source/blender/io/usd/intern/usd_reader_light.cc +++ b/source/blender/io/usd/intern/usd_reader_light.cc @@ -13,7 +13,6 @@ #include <pxr/usd/usdGeom/metrics.h> #include <pxr/usd/usdLux/diskLight.h> #include <pxr/usd/usdLux/distantLight.h> -#include <pxr/usd/usdLux/light.h> #include <pxr/usd/usdLux/rectLight.h> #include <pxr/usd/usdLux/shapingAPI.h> #include <pxr/usd/usdLux/sphereLight.h> diff --git a/source/blender/io/usd/intern/usd_reader_stage.cc b/source/blender/io/usd/intern/usd_reader_stage.cc index 2e7dd0138e3..4ba86c822dc 100644 --- a/source/blender/io/usd/intern/usd_reader_stage.cc +++ b/source/blender/io/usd/intern/usd_reader_stage.cc @@ -281,7 +281,7 @@ USDPrimReader *USDStageReader::collect_readers(Main *bmain, } } - if (prim.IsPseudoRoot() || prim.IsMaster()) { + if (prim.IsPseudoRoot() || prim.IsPrototype()) { return nullptr; } @@ -337,7 +337,7 @@ void USDStageReader::collect_readers(Main *bmain) if (params_.use_instancing) { // Collect the scenegraph instance prototypes. - std::vector<pxr::UsdPrim> protos = stage_->GetMasters(); + std::vector<pxr::UsdPrim> protos = stage_->GetPrototypes(); for (const pxr::UsdPrim &proto_prim : protos) { std::vector<USDPrimReader *> proto_readers; |