archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Geometry Nodes: Implicit conversion add int to color

Browse Source 
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
This commit is contained in:
Charlie Jolly
2021-03-16 18:09:56 +00:00
committed by Charlie Jolly
parent f8497caf59
commit e183f2b6a9
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/addons_contrib

Submodule release/scripts/addons_contrib updated: a140f066ac...70b649775e

3
source/blender/nodes/intern/node_tree_multi_function.cc
View File

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