[Bf-blender-cvs] [5151d05625d] functions-experimental-refactor: cleanup

[Jacques Lucke]

Commit: 5151d05625d2e3cd6fb13d83dff429e319a42773
Author: Jacques Lucke
Date:   Fri Oct 18 17:37:33 2019 +0200
Branches: functions-experimental-refactor
https://developer.blender.org/rB5151d05625d2e3cd6fb13d83dff429e319a42773

cleanup

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

M	source/blender/blenkernel/BKE_multi_function.h
M	source/blender/modifiers/intern/MOD_functiondeform_cxx.cc

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

diff --git a/source/blender/blenkernel/BKE_multi_function.h b/source/blender/blenkernel/BKE_multi_function.h
index 8209143f2d2..81c2896de10 100644
--- a/source/blender/blenkernel/BKE_multi_function.h
+++ b/source/blender/blenkernel/BKE_multi_function.h
@@ -25,6 +25,11 @@ struct MFDataType {
   {
   }
 
+  template<typename T> static MFDataType ForSingle()
+  {
+    return MFDataType(Category::Single, GET_TYPE<T>());
+  }
+
   Category category() const
   {
     return m_category;
diff --git a/source/blender/modifiers/intern/MOD_functiondeform_cxx.cc b/source/blender/modifiers/intern/MOD_functiondeform_cxx.cc
index cf366e39636..e5d8a384579 100644
--- a/source/blender/modifiers/intern/MOD_functiondeform_cxx.cc
+++ b/source/blender/modifiers/intern/MOD_functiondeform_cxx.cc
@@ -11,6 +11,7 @@
 
 using BKE::CPPType;
 using BKE::MFContext;
+using BKE::MFDataType;
 using BKE::MFNetwork;
 using BKE::MFParams;
 using BKE::MFParamsBuilder;
@@ -209,12 +210,9 @@ void MOD_functiondeform_do(FunctionDeformModifierData *fdmd, float (*vertexCos)[
 
   auto network_builder = BLI::make_unique<BKE::MFNetworkBuilder>();
   auto &input_node = network_builder->add_placeholder(
-      {},
-      {BKE::MFDataType{BKE::MFDataType::Single, BKE::GET_TYPE<float3>()},
-       BKE::MFDataType{BKE::MFDataType::Single, BKE::GET_TYPE<float>()}});
+      {}, {MFDataType::ForSingle<float3>(), MFDataType::ForSingle<float>()});
 
-  auto &output_node = network_builder->add_placeholder(
-      {BKE::MFDataType{BKE::MFDataType::Single, BKE::GET_TYPE<float3>()}}, {});
+  auto &output_node = network_builder->add_placeholder({MFDataType::ForSingle<float3>()}, {});
 
   BKE::MultiFunction_AddFloat3s add_function;
   auto &add_node = network_builder->add_function(add_function, {0, 1}, {2});