[Bf-blender-cvs] [e183f2b6a97] master: Geometry Nodes: Implicit conversion add int to color

[Charlie Jolly]

Commit: e183f2b6a97a96c6871b05784438c5a4d4bc069c
Author: Charlie Jolly
Date:   Tue Mar 16 18:09:56 2021 +0000
Branches: master
https://developer.blender.org/rBe183f2b6a97a96c6871b05784438c5a4d4bc069c

Geometry Nodes: Implicit conversion add int to color

Add implicit `int32 to Color4f` conversion. Matches `int32 to float3` conversion logic.

This may not be the most useful conversion but prevents an error in the Attribute Convert node.

Reviewed By: JacquesLucke

Differential Revision: https://developer.blender.org/D10686

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

M	release/scripts/addons_contrib
M	source/blender/nodes/intern/node_tree_multi_function.cc

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

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<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);