diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2022-10-30 00:41:21 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2022-10-30 01:14:59 +0300 |
| commit | bc37e8d8399eef686b71341aa90eced9bc117786 (patch) | |
| tree | 92e4af388150209df9bc44e2cba6f2f303aa7baf /source/blender/io/common/intern/abstract_hierarchy_iterator.cc | |
| parent | 552abb838c76d44a0d7d1226b59a1ab381e88386 (diff) | |
| parent | d1d2f002c7caaf4ab457ec27bbc44666d7aac624 (diff) | |
Merge remote-tracking branch 'origin/master' into principled-v2
Diffstat (limited to 'source/blender/io/common/intern/abstract_hierarchy_iterator.cc')
| -rw-r--r-- | source/blender/io/common/intern/abstract_hierarchy_iterator.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/io/common/intern/abstract_hierarchy_iterator.cc b/source/blender/io/common/intern/abstract_hierarchy_iterator.cc index 1fbddc45964..03c1ba94d94 100644 --- a/source/blender/io/common/intern/abstract_hierarchy_iterator.cc +++ b/source/blender/io/common/intern/abstract_hierarchy_iterator.cc @@ -272,10 +272,11 @@ void AbstractHierarchyIterator::export_graph_construct() ExportGraph::key_type root_node_id = ObjectIdentifier::for_real_object(nullptr); export_graph_[root_node_id] = ExportChildren(); - DEG_OBJECT_ITER_BEGIN (depsgraph_, - object, - DEG_ITER_OBJECT_FLAG_LINKED_DIRECTLY | - DEG_ITER_OBJECT_FLAG_LINKED_VIA_SET) { + DEGObjectIterSettings deg_iter_settings{}; + deg_iter_settings.depsgraph = depsgraph_; + deg_iter_settings.flags = DEG_ITER_OBJECT_FLAG_LINKED_DIRECTLY | + DEG_ITER_OBJECT_FLAG_LINKED_VIA_SET; + DEG_OBJECT_ITER_BEGIN (°_iter_settings, object) { /* Non-instanced objects always have their object-parent as export-parent. */ const bool weak_export = mark_as_weak_export(object); visit_object(object, object->parent, weak_export); |