blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Cleanup: Remove blender namespace from Map.

This commit is contained in:
Jeroen Bakker 2021-04-02 16:16:33 +02:00
parent 36427a8d03
commit 8aff86a0c7
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/compositor/intern/COM_MetaData.cc
View File

@ -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());
}
}

2
source/blender/compositor/intern/COM_MetaData.h
View File

@ -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);

2
source/blender/compositor/intern/COM_NodeOperationBuilder.cc
View File

@ -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);
}

4
source/blender/compositor/intern/COM_NodeOperationBuilder.h
View File

@ -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;