blender
/
blender
137
404
Fork 586
Code Issues 6.2k Pull Requests 761 Projects 19 Wiki Activity

Nodes: support more implicit conversions in simulation node tree

This commit is contained in:
Jacques Lucke 2020-07-12 12:38:30 +02:00
parent 838b1742fb
commit ebf9082e1c
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/blenkernel/intern/node_tree_multi_function.cc
View File

@ -158,6 +158,10 @@ static fn::MFOutputSocket *try_find_origin(CommonMFNetworkBuilderData &common,
static const fn::MultiFunction *try_get_conversion_function(fn::MFDataType from, fn::MFDataType to)
{
if (from == fn::MFDataType::ForSingle<float>()) {
if (to == fn::MFDataType::ForSingle<int32_t>()) {
static fn::CustomMF_Convert<float, int32_t> function;
return &function;
}
if (to == fn::MFDataType::ForSingle<float3>()) {
static fn::CustomMF_Convert<float, float3> function;
return &function;
@ -170,6 +174,18 @@ static const fn::MultiFunction *try_get_conversion_function(fn::MFDataType from,
return &function;
}
}
if (from == fn::MFDataType::ForSingle<int32_t>()) {
if (to == fn::MFDataType::ForSingle<float>()) {
static fn::CustomMF_Convert<int32_t, float> function;
return &function;
}
if (to == fn::MFDataType::ForSingle<float3>()) {
static fn::CustomMF_SI_SO<int32_t, float3> function{
"int32 to float3", [](int32_t a) { return float3((float)a); }};
return &function;
}
}
return nullptr;
}
@ -223,7 +239,6 @@ static void insert_links(CommonMFNetworkBuilderData &common)
}
else {
from_socket = &insert_default_value_for_type(common, to_type);
continue;
}
}