diff options
| author | Jacques Lucke <jacques@blender.org> | 2020-06-10 15:12:24 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2020-06-10 15:15:04 +0300 |
| commit | 84a0a6d16c85105cf755141c4d49afc52eb157e3 (patch) | |
| tree | 2b751e4dc6cb98cbb04459eb0b8c89db5d969cf5 /source/blender/blenkernel/intern | |
| parent | f367f1e5a55e1c657f9d2088f6537fb2e73492f0 (diff) | |
BLI: update behavior of Map.lookup_or_add
Previously, this function would expect a callback function as parameter.
This behavior is now in Map.lookup_or_add_cb. The new version just
takes the key and value directly.
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/derived_node_tree.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/derived_node_tree.cc b/source/blender/blenkernel/intern/derived_node_tree.cc index 80ae521642e..961fef958b7 100644 --- a/source/blender/blenkernel/intern/derived_node_tree.cc +++ b/source/blender/blenkernel/intern/derived_node_tree.cc @@ -24,8 +24,8 @@ namespace BKE { static const NodeTreeRef &get_tree_ref(NodeTreeRefMap &node_tree_refs, bNodeTree *btree) { - return *node_tree_refs.lookup_or_add(btree, - [&]() { return blender::make_unique<NodeTreeRef>(btree); }); + return *node_tree_refs.lookup_or_add_cb( + btree, [&]() { return blender::make_unique<NodeTreeRef>(btree); }); } DerivedNodeTree::DerivedNodeTree(bNodeTree *btree, NodeTreeRefMap &node_tree_refs) : m_btree(btree) @@ -365,7 +365,7 @@ static Dot::Cluster *get_cluster_for_parent(Dot::DirectedGraph &graph, if (parent == nullptr) { return nullptr; } - return clusters.lookup_or_add(parent, [&]() { + return clusters.lookup_or_add_cb(parent, [&]() { Dot::Cluster *parent_cluster = get_cluster_for_parent(graph, clusters, parent->parent()); bNodeTree *btree = (bNodeTree *)parent->node_ref().bnode()->id; Dot::Cluster *new_cluster = &graph.new_cluster(parent->node_ref().name() + " / " + |