diff options
author | Jacques Lucke <jacques@blender.org> | 2021-01-12 23:22:32 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2021-01-12 23:22:32 +0300 |
commit | 1339e7c44f1f9a1c9bc5d6cb0a5702a6fe73515e (patch) | |
tree | 219481d8935a75ad6e2b97fe16193af3f763bb32 /source/blender/nodes/geometry/node_geometry_util.hh | |
parent | b66fcd83f6cef55a87dc9835129f8956fd6c6742 (diff) | |
parent | 719bea0d6d06be579edee2fc3d12a7828bb8e101 (diff) |
Merge branch 'master' into experiment-point-distributiontemp-point-distribution-refactor-experiment
Diffstat (limited to 'source/blender/nodes/geometry/node_geometry_util.hh')
-rw-r--r-- | source/blender/nodes/geometry/node_geometry_util.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/nodes/geometry/node_geometry_util.hh b/source/blender/nodes/geometry/node_geometry_util.hh index 12ede8b6ee0..b7b2afeefcb 100644 --- a/source/blender/nodes/geometry/node_geometry_util.hh +++ b/source/blender/nodes/geometry/node_geometry_util.hh @@ -44,7 +44,7 @@ void update_attribute_input_socket_availabilities(bNode &node, const GeometryNodeAttributeInputMode mode, const bool name_is_available = true); -CustomDataType attribute_domain_highest_complexity(Span<CustomDataType>); +CustomDataType attribute_data_type_highest_complexity(Span<CustomDataType>); Array<uint32_t> get_geometry_element_ids_as_uints(const GeometryComponent &component, const AttributeDomain domain); |