[Bf-blender-cvs] [b83074b2842] usd-importer-T81257-merge: Rename USDReaderStage::handle_prim().

[makowalski]

Commit: b83074b284265bfaf50efb144cc3b23f8747c404
Author: makowalski
Date:   Fri Jun 18 12:11:50 2021 -0400
Branches: usd-importer-T81257-merge
https://developer.blender.org/rBb83074b284265bfaf50efb144cc3b23f8747c404

Rename USDReaderStage::handle_prim().

Renamed to USDReaderStage::collect_readers(), as
it's more descriptive.

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

M	source/blender/io/usd/intern/usd_reader_stage.cc
M	source/blender/io/usd/intern/usd_reader_stage.h

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

diff --git a/source/blender/io/usd/intern/usd_reader_stage.cc b/source/blender/io/usd/intern/usd_reader_stage.cc
index c0b772681d7..96dd3df0f44 100644
--- a/source/blender/io/usd/intern/usd_reader_stage.cc
+++ b/source/blender/io/usd/intern/usd_reader_stage.cc
@@ -214,7 +214,7 @@ static bool _merge_with_parent(USDPrimReader *reader)
   return true;
 }
 
-USDPrimReader *USDStageReader::handle_prim(Main *bmain, const pxr::UsdPrim &prim)
+USDPrimReader *USDStageReader::collect_readers(Main *bmain, const pxr::UsdPrim &prim)
 {
   if (prim.IsA<pxr::UsdGeomImageable>()) {
     pxr::UsdGeomImageable imageable(prim);
@@ -239,7 +239,7 @@ USDPrimReader *USDStageReader::handle_prim(Main *bmain, const pxr::UsdPrim &prim
   std::vector<USDPrimReader *> child_readers;
 
   for (const auto &childPrim : children) {
-    if (USDPrimReader *child_reader = handle_prim(bmain, childPrim)) {
+    if (USDPrimReader *child_reader = collect_readers(bmain, childPrim)) {
       child_readers.push_back(child_reader);
     }
   }
@@ -309,7 +309,7 @@ void USDStageReader::collect_readers(Main *bmain,
   }
 
   stage_->SetInterpolationType(pxr::UsdInterpolationType::UsdInterpolationTypeHeld);
-  handle_prim(bmain, root);
+  collect_readers(bmain, root);
 }
 
 void USDStageReader::clear_readers(bool decref)
diff --git a/source/blender/io/usd/intern/usd_reader_stage.h b/source/blender/io/usd/intern/usd_reader_stage.h
index 159b7429834..904587551fb 100644
--- a/source/blender/io/usd/intern/usd_reader_stage.h
+++ b/source/blender/io/usd/intern/usd_reader_stage.h
@@ -95,7 +95,7 @@ class USDStageReader {
   };
 
  private:
-  USDPrimReader *handle_prim(Main *bmain, const pxr::UsdPrim &prim);
+  USDPrimReader *collect_readers(Main *bmain, const pxr::UsdPrim &prim);
 };
 
 };  // namespace blender::io::usd