[Bf-blender-cvs] [5156e12a0a4] universal-scene-description: Merge branch 'master' into universal-scene-description

[Michael Kowalski]

Commit: 5156e12a0a4350d2f81cdd59d0385b0b04337bf3
Author: Michael Kowalski
Date:   Tue Aug 30 18:13:18 2022 -0400
Branches: universal-scene-description
https://developer.blender.org/rB5156e12a0a4350d2f81cdd59d0385b0b04337bf3

Merge branch 'master' into universal-scene-description

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



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

diff --cc source/blender/io/common/IO_abstract_hierarchy_iterator.h
index 42663c59a9e,966eb640264..25e4ba07363
--- a/source/blender/io/common/IO_abstract_hierarchy_iterator.h
+++ b/source/blender/io/common/IO_abstract_hierarchy_iterator.h
@@@ -347,20 -331,8 +347,20 @@@ class AbstractHierarchyIterator 
    /* Called by release_writers() to free what the create_XXX_writer() functions allocated. */
    virtual void release_writer(AbstractHierarchyWriter *writer) = 0;
  
 +  /* Return true if data writers should be created for this context. */
 +  virtual bool include_data_writers(const HierarchyContext *) const
 +  {
 +    return true;
 +  }
 +
 +  /* Return true if children of the context should be converted to writers. */
 +  virtual bool include_child_writers(const HierarchyContext *) const
 +  {
 +    return true;
 +  }
 +
    AbstractHierarchyWriter *get_writer(const std::string &export_path) const;
-   ExportChildren &graph_children(const HierarchyContext *parent_context);
+   ExportChildren &graph_children(const HierarchyContext *context);
  };
  
  }  // namespace blender::io