[Bf-blender-cvs] [da34e3476e3] functions: cleanup

[Jacques Lucke]

Commit: da34e3476e387e83bf5a77e719000d78cf7b4b37
Author: Jacques Lucke
Date:   Fri Jul 12 12:02:26 2019 +0200
Branches: functions
https://developer.blender.org/rBda34e3476e387e83bf5a77e719000d78cf7b4b37

cleanup

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

M       source/blender/functions/backends/dependencies/dependencies.hpp
M       source/blender/functions/functions/lists.cpp

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

diff --git a/source/blender/functions/backends/dependencies/dependencies.hpp 
b/source/blender/functions/backends/dependencies/dependencies.hpp
index 0164005b39b..eb161754781 100644
--- a/source/blender/functions/backends/dependencies/dependencies.hpp
+++ b/source/blender/functions/backends/dependencies/dependencies.hpp
@@ -34,6 +34,11 @@ class ExternalDependenciesBuilder {
   {
   }
 
+  void pass_through(uint from_index, uint to_index)
+  {
+    this->set_output_objects(to_index, this->get_input_objects(from_index));
+  }
+
   void set_output_objects(uint index, ArrayRef<Object *> objects)
   {
     m_output_objects.add_multiple(index, objects);
diff --git a/source/blender/functions/functions/lists.cpp 
b/source/blender/functions/functions/lists.cpp
index 25ca4b074b3..eb402b94beb 100644
--- a/source/blender/functions/functions/lists.cpp
+++ b/source/blender/functions/functions/lists.cpp
@@ -43,8 +43,7 @@ template<typename T> class CreateSingleElementList : public 
TupleCallBody {
 class CreateSingleElementListDependencies : public DependenciesBody {
   void dependencies(ExternalDependenciesBuilder &deps) const
   {
-    auto objects = deps.get_input_objects(0);
-    deps.set_output_objects(0, objects);
+    deps.pass_through(0, 0);
   }
 };
 
@@ -81,8 +80,8 @@ template<typename T> class AppendToList : public 
TupleCallBody {
 class AppendToListDependencies : public DependenciesBody {
   void dependencies(ExternalDependenciesBuilder &deps) const
   {
-    deps.set_output_objects(0, deps.get_input_objects(0));
-    deps.set_output_objects(0, deps.get_input_objects(1));
+    deps.pass_through(0, 0);
+    deps.pass_through(1, 0);
   }
 };
 
@@ -124,8 +123,8 @@ template<typename T> class GetListElement : public 
TupleCallBody {
 class GetListElementDependencies : public DependenciesBody {
   void dependencies(ExternalDependenciesBuilder &deps) const
   {
-    deps.set_output_objects(0, deps.get_input_objects(0));
-    deps.set_output_objects(0, deps.get_input_objects(2));
+    deps.pass_through(0, 0);
+    deps.pass_through(2, 0);
   }
 };
 
@@ -163,8 +162,8 @@ template<typename T> class CombineLists : public 
TupleCallBody {
 class CombineListsDependencies : public DependenciesBody {
   void dependencies(ExternalDependenciesBuilder &deps) const
   {
-    deps.set_output_objects(0, deps.get_input_objects(0));
-    deps.set_output_objects(0, deps.get_input_objects(1));
+    deps.pass_through(0, 0);
+    deps.pass_through(1, 0);
   }
 };

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