[Bf-blender-cvs] [63260db4a01] soc-2021-porting-modifiers-to-nodes-merge-by-distance: Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-merge-by-distance

[Fabian Schempp]

Commit: 63260db4a011546bd98978e8e312d6a63053bb63
Author: Fabian Schempp
Date:   Thu Sep 30 00:28:18 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-merge-by-distance
https://developer.blender.org/rB63260db4a011546bd98978e8e312d6a63053bb63

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

# Conflicts:
#	release/scripts/startup/nodeitems_builtins.py
#	source/blender/blenkernel/BKE_node.h
#	source/blender/blenkernel/intern/node.cc
#	source/blender/nodes/CMakeLists.txt

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



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

diff --cc release/scripts/startup/nodeitems_builtins.py
index c21926a2b75,06992022edb..165650958cc
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@@ -550,13 -549,12 +549,13 @@@ geometry_node_categories = 
          NodeItem("GeometryNodeTransform"),
          NodeItem("GeometryNodeJoinGeometry"),
          NodeItem("GeometryNodeSeparateComponents"),
-         NodeItem("GeometryNodeSetPosition", poll=geometry_nodes_fields_poll),
-         NodeItem("GeometryNodeRealizeInstances", poll=geometry_nodes_fields_poll),
+         NodeItem("GeometryNodeSetPosition"),
+         NodeItem("GeometryNodeRealizeInstances"),
 +        NodeItem("GeometryNodeMergeByDistance"),
      ]),
      GeometryNodeCategory("GEO_INPUT", "Input", items=[
-         NodeItem("FunctionNodeLegacyRandomFloat", poll=geometry_nodes_fields_legacy_poll),
-         
+         NodeItem("FunctionNodeLegacyRandomFloat", poll=geometry_nodes_legacy_poll),
+ 
          NodeItem("GeometryNodeObjectInfo"),
          NodeItem("GeometryNodeCollectionInfo"),
          NodeItem("ShaderNodeValue"),
diff --cc source/blender/blenkernel/BKE_node.h
index 8bc76a4732d,76a3e75d285..49eabf73bd9
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1502,7 -1502,11 +1502,12 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_CURVE_FILLET 1089
  #define GEO_NODE_DISTRIBUTE_POINTS_ON_FACES 1090
  #define GEO_NODE_STRING_TO_CURVES 1091
- #define GEO_NODE_MERGE_BY_DISTANCE 1092
+ #define GEO_NODE_INSTANCE_ON_POINTS 1092
+ #define GEO_NODE_MESH_TO_POINTS 1093
+ #define GEO_NODE_POINTS_TO_VERTICES 1094
+ #define GEO_NODE_CURVE_REVERSE 1095
+ #define GEO_NODE_PROXIMITY 1096
++#define GEO_NODE_MERGE_BY_DISTANCE 1097
  
  /** \} */
  
diff --cc source/blender/blenkernel/intern/node.cc
index bdf69d71696,a3a82bee8dc..ea1fe708588
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@@ -5773,7 -5769,7 +5769,8 @@@ static void registerGeometryNodes(
    register_node_type_geo_join_geometry();
    register_node_type_geo_material_assign();
    register_node_type_geo_material_replace();
+   register_node_type_geo_material_selection();
 +  register_node_type_geo_merge_by_distance();
    register_node_type_geo_mesh_primitive_circle();
    register_node_type_geo_mesh_primitive_cone();
    register_node_type_geo_mesh_primitive_cube();
diff --cc source/blender/nodes/CMakeLists.txt
index 6b926fc5978,8eaf88a6f1e..de3a23ee6c8
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@@ -222,16 -232,10 +233,11 @@@ set(SR
    geometry/nodes/node_geo_mesh_primitive_line.cc
    geometry/nodes/node_geo_mesh_primitive_uv_sphere.cc
    geometry/nodes/node_geo_mesh_subdivide.cc
-   geometry/nodes/node_geo_mesh_to_curve.cc
-   geometry/nodes/node_geo_object_info.cc
-   geometry/nodes/node_geo_point_instance.cc
-   geometry/nodes/node_geo_point_rotate.cc
-   geometry/nodes/node_geo_point_scale.cc
-   geometry/nodes/node_geo_point_separate.cc
-   geometry/nodes/node_geo_point_translate.cc
-   geometry/nodes/node_geo_points_to_volume.cc
+   geometry/nodes/node_geo_mesh_to_points.cc
 +  geometry/nodes/node_geo_merge_by_distance.cc
-   geometry/nodes/node_geo_raycast.cc
+   geometry/nodes/node_geo_object_info.cc
+   geometry/nodes/node_geo_points_to_vertices.cc
+   geometry/nodes/node_geo_proximity.cc
    geometry/nodes/node_geo_realize_instances.cc
    geometry/nodes/node_geo_separate_components.cc
    geometry/nodes/node_geo_set_position.cc