[Bf-blender-cvs] [7c8ec99b9a8] master: Cleanup: use blender::Vector.

[Jeroen Bakker]

Commit: 7c8ec99b9a8ac8fc36abb893755082bfb8dcdc3d
Author: Jeroen Bakker
Date:   Fri Mar 5 16:21:56 2021 +0100
Branches: master
https://developer.blender.org/rB7c8ec99b9a8ac8fc36abb893755082bfb8dcdc3d

Cleanup: use blender::Vector.

===================================================================

M       source/blender/compositor/intern/COM_ExecutionSystem.cpp
M       source/blender/compositor/intern/COM_ExecutionSystem.h
M       source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
M       source/blender/compositor/intern/COM_NodeOperationBuilder.h

===================================================================

diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.cpp 
b/source/blender/compositor/intern/COM_ExecutionSystem.cpp
index 9d6359e9cb3..21ffb7c045e 100644
--- a/source/blender/compositor/intern/COM_ExecutionSystem.cpp
+++ b/source/blender/compositor/intern/COM_ExecutionSystem.cpp
@@ -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;
diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.h 
b/source/blender/compositor/intern/COM_ExecutionSystem.h
index dd68edd4793..0314c4cfbdd 100644
--- a/source/blender/compositor/intern/COM_ExecutionSystem.h
+++ b/source/blender/compositor/intern/COM_ExecutionSystem.h
@@ -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
diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp 
b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
index 37d8d44ec72..d08290a2fb9 100644
--- a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
+++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
@@ -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);
diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.h 
b/source/blender/compositor/intern/COM_NodeOperationBuilder.h
index 0d362af4512..6d9b5b67f11 100644
--- a/source/blender/compositor/intern/COM_NodeOperationBuilder.h
+++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.h
@@ -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;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs