[Bf-blender-cvs] [e55ffb28a97] master: USD Exporter: make it possible to debug-print arbitrary export graphs

Sybren A. Stüvel noreply at git.blender.org
Thu Jan 9 15:53:05 CET 2020


Commit: e55ffb28a977ef16ef303b766233366086af2bfd
Author: Sybren A. Stüvel
Date:   Thu Jan 9 15:32:08 2020 +0100
Branches: master
https://developer.blender.org/rBe55ffb28a977ef16ef303b766233366086af2bfd

USD Exporter: make it possible to debug-print arbitrary export graphs

This is useful for debugging things like the previous commit.

No functional changes to the actual USD exporter.

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

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 fae41c1bbd0..73124768696 100644
--- a/source/blender/usd/intern/abstract_hierarchy_iterator.cc
+++ b/source/blender/usd/intern/abstract_hierarchy_iterator.cc
@@ -126,10 +126,10 @@ std::string AbstractHierarchyIterator::get_object_data_path(const HierarchyConte
   return path_concatenate(context->export_path, get_object_data_name(context->object));
 }
 
-void AbstractHierarchyIterator::debug_print_export_graph() const
+void AbstractHierarchyIterator::debug_print_export_graph(const ExportGraph &graph) const
 {
   size_t total_graph_size = 0;
-  for (const ExportGraph::value_type &map_iter : export_graph_) {
+  for (const ExportGraph::value_type &map_iter : graph) {
     const DupliAndDuplicator &parent_info = map_iter.first;
     Object *const export_parent = parent_info.first;
     Object *const duplicator = parent_info.second;
diff --git a/source/blender/usd/intern/abstract_hierarchy_iterator.h b/source/blender/usd/intern/abstract_hierarchy_iterator.h
index 10408401797..ebe95751510 100644
--- a/source/blender/usd/intern/abstract_hierarchy_iterator.h
+++ b/source/blender/usd/intern/abstract_hierarchy_iterator.h
@@ -171,7 +171,7 @@ class AbstractHierarchyIterator {
   virtual std::string get_object_data_path(const HierarchyContext *context) const;
 
  private:
-  void debug_print_export_graph() const;
+  void debug_print_export_graph(const ExportGraph &graph) const;
 
   void export_graph_construct();
   void connect_loose_objects();



More information about the Bf-blender-cvs mailing list