[Bf-blender-cvs] [838ac481f27] functions-experimental-refactor: cleanup
Jacques Lucke
noreply at git.blender.org
Fri Oct 18 17:53:38 CEST 2019
Commit: 838ac481f275d7cd2282d262608f2409cd9884a1
Author: Jacques Lucke
Date: Fri Oct 18 17:40:18 2019 +0200
Branches: functions-experimental-refactor
https://developer.blender.org/rB838ac481f275d7cd2282d262608f2409cd9884a1
cleanup
===================================================================
M source/blender/modifiers/intern/MOD_functiondeform_cxx.cc
===================================================================
diff --git a/source/blender/modifiers/intern/MOD_functiondeform_cxx.cc b/source/blender/modifiers/intern/MOD_functiondeform_cxx.cc
index e5d8a384579..a4f3c7beb98 100644
--- a/source/blender/modifiers/intern/MOD_functiondeform_cxx.cc
+++ b/source/blender/modifiers/intern/MOD_functiondeform_cxx.cc
@@ -33,21 +33,21 @@ extern "C" {
void MOD_functiondeform_do(FunctionDeformModifierData *fdmd, float (*vertexCos)[3], int numVerts);
}
-static CPPType &get_type_by_socket(VirtualSocket *vsocket)
+static MFDataType get_type_by_socket(VirtualSocket *vsocket)
{
StringRef idname = vsocket->idname();
if (idname == "fn_FloatSocket") {
- return BKE::GET_TYPE<float>();
+ return MFDataType::ForSingle<float>();
}
else if (idname == "fn_IntegerSocket") {
- return BKE::GET_TYPE<int>();
+ return MFDataType::ForSingle<int>();
}
else if (idname == "fn_VectorSocket") {
- return BKE::GET_TYPE<float3>();
+ return MFDataType::ForSingle<float3>();
}
BLI_assert(false);
- return BKE::GET_TYPE<float>();
+ return MFDataType();
}
static std::unique_ptr<BKE::MultiFunction> get_multi_function_by_node(VirtualNode *vnode)
More information about the Bf-blender-cvs
mailing list