[Bf-blender-cvs] [4bab2cca5d7] soc-2021-porting-modifiers-to-nodes-remesh-blocks: Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-remesh-blocks

[Fabian Schempp]

Commit: 4bab2cca5d78e39178be0738ddb2281e3d958a63
Author: Fabian Schempp
Date:   Sun Aug 15 02:10:46 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-remesh-blocks
https://developer.blender.org/rB4bab2cca5d78e39178be0738ddb2281e3d958a63

Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-remesh-blocks

# Conflicts:
#	source/blender/blenkernel/BKE_node.h
#	source/blender/modifiers/CMakeLists.txt

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index 5ac132321d9,caa7ab6de0a..ffcb3390c55
--- 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_REMESH_BLOCKS 1073
+ #define GEO_NODE_CURVE_SPLINE_TYPE 1073
+ #define GEO_NODE_CURVE_SELECT_HANDLES 1074
++#define GEO_NODE_REMESH_BLOCKS 1075
  
  /** \} */
  
diff --cc source/blender/nodes/NOD_geometry.h
index 56f9a1d02b0,856d787c8d0..1e5389feb7e
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@@ -93,8 -94,8 +94,9 @@@ void register_node_type_geo_point_separ
  void register_node_type_geo_point_translate(void);
  void register_node_type_geo_points_to_volume(void);
  void register_node_type_geo_raycast(void);
 +void register_node_type_geo_remesh_blocks(void);
  void register_node_type_geo_sample_texture(void);
+ void register_node_type_geo_select_by_handle_type(void);
  void register_node_type_geo_select_by_material(void);
  void register_node_type_geo_separate_components(void);
  void register_node_type_geo_subdivision_surface(void);
diff --cc source/blender/nodes/NOD_static_types.h
index dc297e1167d,3852819746e..42c964b3a10
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@@ -334,10 -337,8 +337,9 @@@ DefNode(GeometryNode, GEO_NODE_POINTS_T
  DefNode(GeometryNode, GEO_NODE_RAYCAST, def_geo_raycast, "RAYCAST", Raycast, "Raycast", "")
  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_REMESH_BLOCKS, def_geo_remesh_blocks, "REMESH_BLOCKS", RemeshBlocks, "Remesh Blocks", "")
  DefNode(GeometryNode, GEO_NODE_TRANSFORM, 0, "TRANSFORM", Transform, "Transform", "")
  DefNode(GeometryNode, GEO_NODE_TRIANGULATE, def_geo_triangulate, "TRIANGULATE", Triangulate, "Triangulate", "")
  DefNode(GeometryNode, GEO_NODE_VIEWER, 0, "VIEWER", Viewer, "Viewer", "")