[Bf-blender-cvs] [45904e2dd10] soc-2021-porting-modifiers-to-nodes-remesh-voxel: Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-remesh-voxel

[Fabian Schempp]

Commit: 45904e2dd10c5994fbe8c04f5d4130996531ff21
Author: Fabian Schempp
Date:   Sat Aug 14 21:05:42 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-remesh-voxel
https://developer.blender.org/rB45904e2dd10c5994fbe8c04f5d4130996531ff21

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

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

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index 62edbe6e336,caa7ab6de0a..fce199e5b72
--- 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_VOXEL 1073
+ #define GEO_NODE_CURVE_SPLINE_TYPE 1073
+ #define GEO_NODE_CURVE_SELECT_HANDLES 1074
++#define GEO_NODE_REMESH_VOXEL 1075
  
  /** \} */
  
diff --cc source/blender/nodes/NOD_geometry.h
index af43e9872cb,856d787c8d0..739fe880e12
--- 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_voxel(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 0dc09dcfe4f,3852819746e..eb04f3e77ce
--- 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_VOXEL, 0, "REMESH_VOXEL", Remesh, "Voxel Remesh", "")
  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", "")