[Bf-blender-cvs] [20d2c921198] 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: 20d2c921198014d0584f8416c4fe56ff5db8388e
Author: Fabian Schempp
Date:   Thu Aug 12 21:49:52 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-merge-by-distance
https://developer.blender.org/rB20d2c921198014d0584f8416c4fe56ff5db8388e

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

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index 1710ba2a4f1,caa7ab6de0a..7e88f52a154
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1466,7 -1475,8 +1475,9 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_CURVE_PRIMITIVE_QUADRILATERAL 1070
  #define GEO_NODE_CURVE_TRIM 1071
  #define GEO_NODE_CURVE_SET_HANDLES 1072
- #define GEO_NODE_MERGE_BY_DISTANCE 1073
+ #define GEO_NODE_CURVE_SPLINE_TYPE 1073
+ #define GEO_NODE_CURVE_SELECT_HANDLES 1074
++#define GEO_NODE_MERGE_BY_DISTANCE 1075
  
  /** \} */
  
diff --cc source/blender/blenkernel/intern/node.cc
index 7cbbe61a8db,bd22f049a8b..fe19a46588e
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@@ -5150,8 -5181,8 +5181,9 @@@ static void registerGeometryNodes(
    register_node_type_geo_point_translate();
    register_node_type_geo_points_to_volume();
    register_node_type_geo_raycast();
 +  register_node_type_geo_merge_by_distance();
    register_node_type_geo_sample_texture();
+   register_node_type_geo_select_by_handle_type();
    register_node_type_geo_select_by_material();
    register_node_type_geo_separate_components();
    register_node_type_geo_subdivision_surface();
diff --cc source/blender/nodes/NOD_static_types.h
index 1a81ba38491,3852819746e..2bf4e91a13b
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@@ -332,10 -335,8 +335,9 @@@ DefNode(GeometryNode, GEO_NODE_POINT_SE
  DefNode(GeometryNode, GEO_NODE_POINT_TRANSLATE, def_geo_point_translate, "POINT_TRANSLATE", PointTranslate, "Point Translate", "")
  DefNode(GeometryNode, GEO_NODE_POINTS_TO_VOLUME, def_geo_points_to_volume, "POINTS_TO_VOLUME", PointsToVolume, "Points to Volume", "")
  DefNode(GeometryNode, GEO_NODE_RAYCAST, def_geo_raycast, "RAYCAST", Raycast, "Raycast", "")
 +DefNode(GeometryNode, GEO_NODE_MERGE_BY_DISTANCE, def_geo_merge_by_distance, "MERGE_BY_DISTANCE", MergeByDistance, "Merge by Distance", "")
  DefNode(GeometryNode, GEO_NODE_SELECT_BY_MATERIAL, 0, "SELECT_BY_MATERIAL", SelectByMaterial, "Select by Material", "")
  DefNode(GeometryNode, GEO_NODE_SEPARATE_COMPONENTS, 0, "SEPARATE_COMPONENTS", SeparateComponents, "Separate Components", "")
- DefNode(GeometryNode, GEO_NODE_MESH_SUBDIVIDE, 0, "MESH_SUBDIVIDE", MeshSubdivide, "Mesh Subdivide", "")
  DefNode(GeometryNode, GEO_NODE_SUBDIVISION_SURFACE, 0, "SUBDIVISION_SURFACE", SubdivisionSurface, "Subdivision Surface", "")
  DefNode(GeometryNode, GEO_NODE_SWITCH, def_geo_switch, "SWITCH", Switch, "Switch", "")
  DefNode(GeometryNode, GEO_NODE_TRANSFORM, 0, "TRANSFORM", Transform, "Transform", "")