[Bf-blender-cvs] [dacea3dd2f8] temp-sybren-usd-patch-01: USD: renamed should_visit_duplilink() to should_visit_dupli_object()

[Sybren A. Stüvel]

Commit: dacea3dd2f8c2a3fa5bae55479b9ffeef0306c8c
Author: Sybren A. Stüvel
Date:   Tue Nov 26 13:01:42 2019 +0100
Branches: temp-sybren-usd-patch-01
https://developer.blender.org/rBdacea3dd2f8c2a3fa5bae55479b9ffeef0306c8c

USD: renamed should_visit_duplilink() to should_visit_dupli_object()

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

M	source/blender/usd/intern/abstract_hierarchy_iterator.cc
M	source/blender/usd/intern/abstract_hierarchy_iterator.h

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

diff --git a/source/blender/usd/intern/abstract_hierarchy_iterator.cc b/source/blender/usd/intern/abstract_hierarchy_iterator.cc
index 77ab1ba5a7e..48c27edc2e1 100644
--- a/source/blender/usd/intern/abstract_hierarchy_iterator.cc
+++ b/source/blender/usd/intern/abstract_hierarchy_iterator.cc
@@ -194,14 +194,14 @@ void AbstractHierarchyIterator::export_graph_construct()
       // is also duplicated itself.
       std::set<Object *> dupli_set;
       for (link = static_cast<DupliObject *>(lb->first); link; link = link->next) {
-        if (!should_visit_duplilink(link)) {
+        if (!should_visit_dupli_object(link)) {
           continue;
         }
         dupli_set.insert(link->ob);
       }
 
       for (link = static_cast<DupliObject *>(lb->first); link; link = link->next) {
-        if (!should_visit_duplilink(link)) {
+        if (!should_visit_dupli_object(link)) {
           continue;
         }
 
@@ -544,10 +544,10 @@ std::string AbstractHierarchyIterator::path_concatenate(const std::string &paren
   return parent_path + "/" + child_path;
 }
 
-bool AbstractHierarchyIterator::should_visit_duplilink(const DupliObject *link) const
+bool AbstractHierarchyIterator::should_visit_dupli_object(const DupliObject *dupli_object) const
 {
-  // Removing link->no_draw hides things like custom bone shapes.
-  return !link->no_draw;
+  // Removing dupli_object->no_draw hides things like custom bone shapes.
+  return !dupli_object->no_draw;
 }
 bool AbstractHierarchyIterator::should_export_object(const Object * /*object*/) const
 {
diff --git a/source/blender/usd/intern/abstract_hierarchy_iterator.h b/source/blender/usd/intern/abstract_hierarchy_iterator.h
index 438b5b571be..7e672fb355e 100644
--- a/source/blender/usd/intern/abstract_hierarchy_iterator.h
+++ b/source/blender/usd/intern/abstract_hierarchy_iterator.h
@@ -209,7 +209,7 @@ class AbstractHierarchyIterator {
   virtual std::string path_concatenate(const std::string &parent_path,
                                        const std::string &child_path) const;
 
-  virtual bool should_visit_duplilink(const DupliObject *link) const;
+  virtual bool should_visit_dupli_object(const DupliObject *dupli_object) const;
   virtual bool should_export_object(const Object *object) const;
 
   /* These functions should create an AbstractHierarchyWriter subclass instance, or return