diff options
| author | Charlie Jolly <charlie> | 2021-03-16 21:09:56 +0300 |
|---|---|---|
| committer | Charlie Jolly <mistajolly@gmail.com> | 2021-03-16 21:14:30 +0300 |
| commit | e183f2b6a97a96c6871b05784438c5a4d4bc069c (patch) | |
| tree | f8b1d9307f2158a7d233d427544f1e486a214927 | |
| parent | f8497caf59e8fd6f8e42dc423c8f960a4ed7d04a (diff) | |
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 | 0 | ||||
| -rw-r--r-- | source/blender/nodes/intern/node_tree_multi_function.cc | 3 |
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); |