Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
m---------release/scripts/addons_contrib0
-rw-r--r--source/blender/nodes/intern/node_tree_multi_function.cc3
2 files changed, 3 insertions, 0 deletions
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
-Subproject a140f066ac99e1860af38080f008507029a3470
+Subproject 70b649775eeeebedb02c1c7b7aa996a7f629417
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<int32_t, float3>(
conversions, "int32 to float3", [](int32_t a) { return float3((float)a); });
+ add_implicit_conversion<int32_t, Color4f>(conversions, "int32 to Color4f", [](int32_t a) {
+ return Color4f((float)a, (float)a, (float)a, 1.0f);
+ });
add_implicit_conversion<bool, float>(conversions);
add_implicit_conversion<bool, int32_t>(conversions);