[Bf-blender-cvs] [745ff852f54] gsoc-2021-porting-modifiers-to-nodes-solidify: Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-solidify

[Fabian Schempp]

Commit: 745ff852f546ca4f0b23b083ac6f467910fd3eef
Author: Fabian Schempp
Date:   Fri Aug 6 07:58:14 2021 +0200
Branches: gsoc-2021-porting-modifiers-to-nodes-solidify
https://developer.blender.org/rB745ff852f546ca4f0b23b083ac6f467910fd3eef

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

# Conflicts:
#	source/blender/blenkernel/BKE_node.h
#	source/blender/geometry/intern/solidify_nonmanifold.c
#	source/blender/nodes/NOD_static_types.h

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index 3e28a44d4bb,caa7ab6de0a..54d3b80fb5c
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1459,7 -1473,10 +1473,11 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_CURVE_PRIMITIVE_LINE 1068
  #define GEO_NODE_CURVE_ENDPOINTS 1069
  #define GEO_NODE_CURVE_PRIMITIVE_QUADRILATERAL 1070
- #define GEO_NODE_SOLIDIFY 1071
+ #define GEO_NODE_CURVE_TRIM 1071
+ #define GEO_NODE_CURVE_SET_HANDLES 1072
+ #define GEO_NODE_CURVE_SPLINE_TYPE 1073
+ #define GEO_NODE_CURVE_SELECT_HANDLES 1074
++#define GEO_NODE_SOLIDIFY 1075
  
  /** \} */
  
diff --cc source/blender/blenkernel/intern/node.cc
index 2c56d34586b,4aec5a9e667..a52f4f020d5
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@@ -5147,9 -5181,9 +5181,10 @@@ static void registerGeometryNodes(
    register_node_type_geo_points_to_volume();
    register_node_type_geo_raycast();
    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_solidify();
    register_node_type_geo_subdivision_surface();
    register_node_type_geo_switch();
    register_node_type_geo_transform();
diff --cc source/blender/nodes/NOD_geometry.h
index 63f6d289342,856d787c8d0..2dcc64b1d4d
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@@ -92,9 -95,9 +95,10 @@@ void register_node_type_geo_point_trans
  void register_node_type_geo_points_to_volume(void);
  void register_node_type_geo_raycast(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_solidify(void);
  void register_node_type_geo_subdivision_surface(void);
  void register_node_type_geo_switch(void);
  void register_node_type_geo_transform(void);
diff --cc source/blender/nodes/NOD_static_types.h
index 6417e9f87b3,3852819746e..33ff92dbff8
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@@ -332,8 -337,6 +337,7 @@@ 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_SOLIDIFY, def_geo_solidify, "SOLIDIFY", Solidify, "Solidify", "")
  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", "")