Blender Git Loki

Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-merge-by-distance

Changes based on review bv Hans Goudey (HooglyBoogly)

Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-merge-by-distance

# Conflicts:
# source/blender/blenkernel/BKE_node.h
# source/blender/editors/asset/ED_asset_temp_id_consumer.h

Merge remote-tracking branch 'origin/soc-2021-porting-modifiers-to-nodes-merge-by-distance' into soc-2021-porting-modifiers-to-nodes-merge-by-distance

- copied point cloud support from D10888 to this patch
- added support for selection with point cloud mode

- copied point cloud support from D10888 to this patch
- added support for selection with point cloud mode

Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-merge-by-distance

# Conflicts:
# source/blender/modifiers/intern/MOD_weld.c

Merge remote-tracking branch 'origin/soc-2021-porting-modifiers-to-nodes-merge-by-distance' into soc-2021-porting-modifiers-to-nodes-merge-by-distance

Geometry Nodes: Merge by Distance (Direct Modifier Port)

This patch is a direct port of the Weld modifier that moves the
common code to the geometry module.
I had made another version of a Merge by Distance Modifier (D10888), with an own implementation,
but I found that the original modifiers algorithm gives finer results.

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

formatting

Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-merge-by-distance

# Conflicts:
# source/blender/blenkernel/BKE_node.h

initial commit

initial commit