[Bf-blender-cvs] [93a9e201f10] tmp-usd-mak-c87f6242: Fixed USD 21.11 compile errors.

[Michael Kowalski]

Commit: 93a9e201f107cb0f4eff5e475096c4105ac0cb96
Author: Michael Kowalski
Date:   Sun May 1 20:33:48 2022 -0400
Branches: tmp-usd-mak-c87f6242
https://developer.blender.org/rB93a9e201f107cb0f4eff5e475096c4105ac0cb96

Fixed USD 21.11 compile errors.

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

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_stage.cc

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

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;