diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib index a140f066ac9..70b649775ee 160000 --- a/release/scripts/addons_contrib +++ b/release/scripts/addons_contrib @@ -1 +1 @@ -Subproject commit a140f066ac99e1860af38080f008507029a34706 +Subproject commit 70b649775eeeebedb02c1c7b7aa996a7f6294177 diff --git a/source/blender/nodes/intern/node_tree_multi_function.cc b/source/blender/nodes/intern/node_tree_multi_function.cc index f9f199c8d1f..b973350becd 100644 --- a/source/blender/nodes/intern/node_tree_multi_function.cc +++ b/source/blender/nodes/intern/node_tree_multi_function.cc @@ -195,6 +195,9 @@ static DataTypeConversions create_implicit_conversions() conversions, "int32 to float2", [](int32_t a) { return float2((float)a); }); add_implicit_conversion( conversions, "int32 to float3", [](int32_t a) { return float3((float)a); }); + add_implicit_conversion(conversions, "int32 to Color4f", [](int32_t a) { + return Color4f((float)a, (float)a, (float)a, 1.0f); + }); add_implicit_conversion(conversions); add_implicit_conversion(conversions);