[Bf-blender-cvs] [a5c82735bb8] usd-importer-T81257: USD import: format fix and remove debug prints.

[makowalski]

Commit: a5c82735bb8241ac5de73344b47468f98e421430
Author: makowalski
Date:   Mon Feb 15 00:11:35 2021 -0500
Branches: usd-importer-T81257
https://developer.blender.org/rBa5c82735bb8241ac5de73344b47468f98e421430

USD import: format fix and remove debug prints.

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

M	source/blender/io/usd/import/usd_prim_iterator.cc
M	source/blender/io/usd/import/usd_reader_instance.cc

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

diff --git a/source/blender/io/usd/import/usd_prim_iterator.cc b/source/blender/io/usd/import/usd_prim_iterator.cc
index 6d6ce31b437..1e97211bf0a 100644
--- a/source/blender/io/usd/import/usd_prim_iterator.cc
+++ b/source/blender/io/usd/import/usd_prim_iterator.cc
@@ -130,9 +130,6 @@ USDXformableReader *USDPrimIterator::get_object_reader(const pxr::UsdPrim &prim,
   USDXformableReader *result = nullptr;
 
   if (context.import_params.use_instancing && prim.IsInstance()) {
-    std::cout << "Have instance " << prim.GetPath() << std::endl;
-    std::cout << "    Instance type: " << prim.GetTypeName() << std::endl;
-    std::cout << "    Master: " << prim.GetMaster().GetPath() << std::endl;
     result = new USDInstanceReader(prim, context);
   }
   else if (prim.IsA<pxr::UsdGeomCamera>()) {
@@ -325,16 +322,6 @@ void USDPrimIterator::create_prototype_object_readers(
       continue;
     }
 
-    std::cout << "master: " << proto_prim.GetPath() << std::endl;
-
-    std::vector<pxr::UsdPrim> insts = proto_prim.GetInstances();
-
-    for (const pxr::UsdPrim &inst : insts) {
-      if (inst) {
-        std::cout << "   inst: " << inst.GetPath() << std::endl;
-      }
-    }
-
     std::vector<USDXformableReader *> proto_readers;
     std::vector<USDXformableReader *> child_readers;
 
diff --git a/source/blender/io/usd/import/usd_reader_instance.cc b/source/blender/io/usd/import/usd_reader_instance.cc
index 1c024390e36..30923dea830 100644
--- a/source/blender/io/usd/import/usd_reader_instance.cc
+++ b/source/blender/io/usd/import/usd_reader_instance.cc
@@ -77,8 +77,7 @@ void USDInstanceReader::set_instance_collection(Collection *coll)
 
 pxr::SdfPath USDInstanceReader::proto_path() const
 {
-  if (pxr::UsdPrim master = prim_.GetMaster())
-  {
+  if (pxr::UsdPrim master = prim_.GetMaster()) {
     return master.GetPath();
   }