diff options
author | Jeroen Bakker <jeroen@blender.org> | 2021-04-02 17:16:33 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2021-04-02 17:16:33 +0300 |
commit | 8aff86a0c7a1661d2c3381730c326504ef035e0d (patch) | |
tree | d00f03e29ad07bac3ef5fd65be26c0bb6d745a64 /source/blender/compositor/intern | |
parent | 36427a8d03673a8604d3ec4b30be709e86fe6312 (diff) |
Cleanup: Remove blender namespace from Map.
Diffstat (limited to 'source/blender/compositor/intern')
4 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/compositor/intern/COM_MetaData.cc b/source/blender/compositor/intern/COM_MetaData.cc index 6762955ef78..88bfa385514 100644 --- a/source/blender/compositor/intern/COM_MetaData.cc +++ b/source/blender/compositor/intern/COM_MetaData.cc @@ -66,7 +66,7 @@ void MetaData::replaceHashNeutralCryptomatteKeys(const blender::StringRef layer_ void MetaData::addToRenderResult(RenderResult *render_result) const { - for (blender::Map<std::string, std::string>::Item entry : entries_.items()) { + for (Map<std::string, std::string>::Item entry : entries_.items()) { BKE_render_result_stamp_data(render_result, entry.key.c_str(), entry.value.c_str()); } } diff --git a/source/blender/compositor/intern/COM_MetaData.h b/source/blender/compositor/intern/COM_MetaData.h index ce437fd5df8..a76540dc3af 100644 --- a/source/blender/compositor/intern/COM_MetaData.h +++ b/source/blender/compositor/intern/COM_MetaData.h @@ -43,7 +43,7 @@ constexpr blender::StringRef META_DATA_KEY_CRYPTOMATTE_NAME("cryptomatte/{hash}/ class MetaData { private: - blender::Map<std::string, std::string> entries_; + Map<std::string, std::string> entries_; void addCryptomatteEntry(const blender::StringRef layer_name, const blender::StringRefNull key, const blender::StringRef value); diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.cc b/source/blender/compositor/intern/COM_NodeOperationBuilder.cc index 717602d04ab..59ce56a7cd5 100644 --- a/source/blender/compositor/intern/COM_NodeOperationBuilder.cc +++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.cc @@ -69,7 +69,7 @@ void NodeOperationBuilder::convertToOperations(ExecutionSystem *system) * so multiple operations can use the same node input. */ blender::MultiValueMap<NodeInput *, NodeOperationInput *> inverse_input_map; - for (blender::Map<NodeOperationInput *, NodeInput *>::MutableItem item : m_input_map.items()) { + for (Map<NodeOperationInput *, NodeInput *>::MutableItem item : m_input_map.items()) { inverse_input_map.add(item.value, item.key); } diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.h b/source/blender/compositor/intern/COM_NodeOperationBuilder.h index 6eaeded0fbe..b6fb0ebcc9e 100644 --- a/source/blender/compositor/intern/COM_NodeOperationBuilder.h +++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.h @@ -73,9 +73,9 @@ class NodeOperationBuilder { Vector<ExecutionGroup *> m_groups; /** Maps operation inputs to node inputs */ - blender::Map<NodeOperationInput *, NodeInput *> m_input_map; + Map<NodeOperationInput *, NodeInput *> m_input_map; /** Maps node outputs to operation outputs */ - blender::Map<NodeOutput *, NodeOperationOutput *> m_output_map; + Map<NodeOutput *, NodeOperationOutput *> m_output_map; Node *m_current_node; |