[Bf-blender-cvs] [1339e7c44f1] temp-point-distribution-refactor-experiment: Merge branch 'master' into experiment-point-distribution

[Jacques Lucke]

Commit: 1339e7c44f1f9a1c9bc5d6cb0a5702a6fe73515e
Author: Jacques Lucke
Date:   Tue Jan 12 21:22:32 2021 +0100
Branches: temp-point-distribution-refactor-experiment
https://developer.blender.org/rB1339e7c44f1f9a1c9bc5d6cb0a5702a6fe73515e

Merge branch 'master' into experiment-point-distribution

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



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

diff --cc source/blender/nodes/geometry/node_geometry_util.hh
index 12ede8b6ee0,0cabe5e1155..b7b2afeefcb
--- a/source/blender/nodes/geometry/node_geometry_util.hh
+++ b/source/blender/nodes/geometry/node_geometry_util.hh
@@@ -44,8 -44,13 +44,8 @@@ void update_attribute_input_socket_avai
                                                    const GeometryNodeAttributeInputMode mode,
                                                    const bool name_is_available = true);
  
- CustomDataType attribute_domain_highest_complexity(Span<CustomDataType>);
+ CustomDataType attribute_data_type_highest_complexity(Span<CustomDataType>);
  
 -void poisson_disk_point_elimination(Vector<float3> const *input_points,
 -                                    Vector<float3> *output_points,
 -                                    float maximum_distance,
 -                                    float3 boundbox);
 -
  Array<uint32_t> get_geometry_element_ids_as_uints(const GeometryComponent &component,
                                                    const AttributeDomain domain);