archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: use blender::Vector.

Browse Source
This commit is contained in:
Jeroen Bakker
2021-03-05 16:21:56 +01:00
parent 7bccbce512
commit 7c8ec99b9a
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/compositor/intern/COM_ExecutionSystem.cpp
View File

@@ -121,7 +121,8 @@ ExecutionSystem::~ExecutionSystem()
this->m_groups.clear();
}
void ExecutionSystem::set_operations(const Operations &operations, const Groups &groups)
void ExecutionSystem::set_operations(const Operations &operations,
const blender::Vector<ExecutionGroup *> &groups)
{
m_operations = operations;
m_groups = groups;

6
source/blender/compositor/intern/COM_ExecutionSystem.h
View File

@@ -115,7 +115,6 @@ class ExecutionGroup;
class ExecutionSystem {
public:
typedef std::vector<NodeOperation *> Operations;
typedef std::vector<ExecutionGroup *> Groups;
private:
/**
@@ -131,7 +130,7 @@ class ExecutionSystem {
/**
* \brief vector of groups
*/
Groups m_groups;
blender::Vector<ExecutionGroup *> m_groups;
private: // methods
/**
@@ -162,7 +161,8 @@ class ExecutionSystem {
*/
~ExecutionSystem();
void set_operations(const Operations &operations, const Groups &groups);
void set_operations(const Operations &operations,
const blender::Vector<ExecutionGroup *> &groups);
/**
* \brief execute this system

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

@@ -705,7 +705,7 @@ static void add_group_operations_recursive(Tags &visited, NodeOperation *op, Exe
ExecutionGroup *NodeOperationBuilder::make_group(NodeOperation *op)
{
ExecutionGroup *group = new ExecutionGroup();
m_groups.push_back(group);
m_groups.append(group);
Tags visited;
add_group_operations_recursive(visited, op, group);

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

@@ -64,7 +64,6 @@ class NodeOperationBuilder {
typedef std::vector<NodeOperation *> Operations;
typedef std::vector<Link> Links;
typedef std::vector<ExecutionGroup *> Groups;
typedef std::map<NodeOperationInput *, NodeInput *> InputSocketMap;
typedef std::map<NodeOutput *, NodeOperationOutput *> OutputSocketMap;
@@ -78,7 +77,7 @@ class NodeOperationBuilder {
Operations m_operations;
Links m_links;
Groups m_groups;
blender::Vector<ExecutionGroup *> m_groups;
/** Maps operation inputs to node inputs */
InputSocketMap m_input_map;