Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <jacques@blender.org>2020-06-10 16:25:39 +0300
committerJacques Lucke <jacques@blender.org>2020-06-10 16:33:50 +0300
commita7ea07c6777a93373c8261d4a36edcee8a66a460 (patch)
tree3ea0626fadf4ad92571ce6ee78b8851c38700d64 /source/blender/depsgraph/intern/builder
parent044b824c9d4e718391fcb69ac226b61a4638c42a (diff)
Depsgraph: use blender::Vector instead of std::vector
We decided that `blender::Vector` should be the default choice for a vector data structure in Blender. Reviewers: sergey Differential Revision: https://developer.blender.org/D7981
Diffstat (limited to 'source/blender/depsgraph/intern/builder')
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_nodes.cc6
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_nodes.h2
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_relations.cc4
3 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 9230fa19c32..513472f6ec9 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -179,7 +179,7 @@ IDNode *DepsgraphNodeBuilder::add_id_node(ID *id)
OperationCode::COPY_ON_WRITE,
"",
-1);
- graph_->operations.push_back(op_cow);
+ graph_->operations.append(op_cow);
}
return id_node;
}
@@ -213,7 +213,7 @@ OperationNode *DepsgraphNodeBuilder::add_operation_node(ComponentNode *comp_node
OperationNode *op_node = comp_node->find_operation(opcode, name, name_tag);
if (op_node == nullptr) {
op_node = comp_node->add_operation(op, opcode, name, name_tag);
- graph_->operations.push_back(op_node);
+ graph_->operations.append(op_node);
}
else {
fprintf(stderr,
@@ -347,7 +347,7 @@ void DepsgraphNodeBuilder::begin_build()
entry_tag.opcode = op_node->opcode;
entry_tag.name = op_node->name;
entry_tag.name_tag = op_node->name_tag;
- saved_entry_tags_.push_back(entry_tag);
+ saved_entry_tags_.append(entry_tag);
}
/* Make sure graph has no nodes left from previous state. */
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
index 5cd7f7449a2..8c0e486ec04 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h
@@ -251,7 +251,7 @@ class DepsgraphNodeBuilder : public DepsgraphBuilder {
string name;
int name_tag;
};
- vector<SavedEntryTag> saved_entry_tags_;
+ Vector<SavedEntryTag> saved_entry_tags_;
struct BuilderWalkUserData {
DepsgraphNodeBuilder *builder;
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index f5a131a1731..92dff751b8a 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -2887,7 +2887,7 @@ void DepsgraphRelationBuilder::build_driver_relations(IDNode *id_node)
}
// Mapping from RNA prefix -> set of driver evaluation nodes:
- typedef vector<Node *> DriverGroup;
+ typedef Vector<Node *> DriverGroup;
typedef map<string, DriverGroup> DriverGroupMap;
DriverGroupMap driver_groups;
@@ -2906,7 +2906,7 @@ void DepsgraphRelationBuilder::build_driver_relations(IDNode *id_node)
OperationKey driver_key(
id_orig, NodeType::PARAMETERS, OperationCode::DRIVER, fcu->rna_path, fcu->array_index);
Node *node_driver = get_node(driver_key);
- driver_groups[rna_prefix].push_back(node_driver);
+ driver_groups[rna_prefix].append(node_driver);
}
for (pair<string, DriverGroup> prefix_group : driver_groups) {