Commit: c690db018ae007c2c977525833bd81c2e7cbe2bf
Author: Sybren A. Stüvel
Date: Tue Nov 26 12:51:36 2019 +0100
Branches: temp-sybren-usd-patch-02
https://developer.blender.org/rBc690db018ae007c2c977525833bd81c2e7cbe2bf
USD: explicit typedef for `ExportGraph::mapped_type`
===================================================================
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 3489f6878e0..77ab1ba5a7e 100644
--- a/source/blender/usd/intern/abstract_hierarchy_iterator.cc
+++ b/source/blender/usd/intern/abstract_hierarchy_iterator.cc
@@ -326,7 +326,7 @@ void
AbstractHierarchyIterator::visit_dupli_object(DupliObject *dupli_object,
export_graph_[graph_index].insert(context);
}
-AbstractHierarchyIterator::ExportGraph::mapped_type
&AbstractHierarchyIterator::graph_children(
+AbstractHierarchyIterator::ExportChildren
&AbstractHierarchyIterator::graph_children(
const HierarchyContext *context)
{
if (context == nullptr) {
@@ -363,7 +363,7 @@ void
AbstractHierarchyIterator::determine_export_paths(const HierarchyContext *p
void AbstractHierarchyIterator::determine_duplication_references(
const HierarchyContext *parent_context, std::string indent)
{
- ExportGraph::mapped_type children = graph_children(parent_context);
+ ExportChildren children = graph_children(parent_context);
for (HierarchyContext *context : children) {
if (context->duplicator != nullptr) {
diff --git a/source/blender/usd/intern/abstract_hierarchy_iterator.h
b/source/blender/usd/intern/abstract_hierarchy_iterator.h
index 5215aa49f46..f1152230219 100644
--- a/source/blender/usd/intern/abstract_hierarchy_iterator.h
+++ b/source/blender/usd/intern/abstract_hierarchy_iterator.h
@@ -129,8 +129,10 @@ class AbstractHierarchyIterator {
/* Pair of a duplicated object and its duplicator, typically a pair of
HierarchyContext::object
* and HierarchyContext::duplicator. */
typedef std::pair<Object *, Object *> DupliAndDuplicator;
+ /* All the children of some object, as per the export hierarchy. */
+ typedef std::set<HierarchyContext *> ExportChildren;
/* Mapping from an object and its duplicator to the object's
export-children. */
- typedef std::map<DupliAndDuplicator, std::set<HierarchyContext *>>
ExportGraph;
+ typedef std::map<DupliAndDuplicator, ExportChildren> ExportGraph;
/* Mapping from duplicator ID to export path. */
typedef std::map<ID *, std::string> ExportPathMap;
@@ -177,7 +179,7 @@ class AbstractHierarchyIterator {
Object *duplicator,
const std::set<Object *> &dupli_set);
- ExportGraph::mapped_type &graph_children(const HierarchyContext
*parent_context);
+ ExportChildren &graph_children(const HierarchyContext *parent_context);
void determine_export_paths(const HierarchyContext *parent_context);
void determine_duplication_references(const HierarchyContext *parent_context,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
