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

[Fabian Schempp]

Commit: de9dda76abe12f39941345acb4558f3e356d2380
Author: Fabian Schempp
Date:   Thu Jul 15 00:07:52 2021 +0200
Branches: gsoc-2021-porting-modifiers-to-nodes-solidify
https://developer.blender.org/rBde9dda76abe12f39941345acb4558f3e356d2380

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

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

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



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

diff --cc release/scripts/startup/nodeitems_builtins.py
index 6faeffac043,d617cfab988..69cb50a6bb3
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@@ -538,10 -548,9 +548,10 @@@ geometry_node_categories = 
          NodeItem("GeometryNodeTriangulate"),
          NodeItem("GeometryNodeEdgeSplit"),
          NodeItem("GeometryNodeSubdivisionSurface"),
-         NodeItem("GeometryNodeSubdivide"),
+         NodeItem("GeometryNodeMeshSubdivide"),
 +        NodeItem("GeometryNodeSolidify"),
      ]),
-     GeometryNodeCategory("GEO_PRIMITIVES", "Mesh Primitives", items=[
+     GeometryNodeCategory("GEO_PRIMITIVES_MESH", "Mesh Primitives", items=[
          NodeItem("GeometryNodeMeshCircle"),
          NodeItem("GeometryNodeMeshCone"),
          NodeItem("GeometryNodeMeshCube"),
@@@ -551,6 -560,7 +561,7 @@@
          NodeItem("GeometryNodeMeshLine"),
          NodeItem("GeometryNodeMeshUVSphere"),
      ]),
 -    
++
      GeometryNodeCategory("GEO_POINT", "Point", items=[
          NodeItem("GeometryNodePointDistribute"),
          NodeItem("GeometryNodePointInstance"),
diff --cc source/blender/blenkernel/BKE_node.h
index 40e46c766ee,b1a38ec5700..3e28a44d4bb
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1439,7 -1450,15 +1450,16 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_SEPARATE_COMPONENTS 1059
  #define GEO_NODE_CURVE_SUBDIVIDE 1060
  #define GEO_NODE_RAYCAST 1061
- #define GEO_NODE_SOLIDIFY 1062
+ #define GEO_NODE_CURVE_PRIMITIVE_STAR 1062
+ #define GEO_NODE_CURVE_PRIMITIVE_SPIRAL 1063
+ #define GEO_NODE_CURVE_PRIMITIVE_QUADRATIC_BEZIER 1064
+ #define GEO_NODE_CURVE_PRIMITIVE_BEZIER_SEGMENT 1065
+ #define GEO_NODE_CURVE_PRIMITIVE_CIRCLE 1066
+ #define GEO_NODE_VIEWER 1067
+ #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
  
  /** \} */
  
diff --cc source/blender/blenkernel/intern/node.cc
index 6df74cc1501,e4c259ec9fc..2c56d34586b
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@@ -5087,8 -5149,6 +5149,7 @@@ static void registerGeometryNodes(
    register_node_type_geo_sample_texture();
    register_node_type_geo_select_by_material();
    register_node_type_geo_separate_components();
 +  register_node_type_geo_solidify();
-   register_node_type_geo_subdivide();
    register_node_type_geo_subdivision_surface();
    register_node_type_geo_switch();
    register_node_type_geo_transform();
diff --cc source/blender/nodes/CMakeLists.txt
index ee395f0e235,dc19508be04..74d6c70af3c
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@@ -196,8 -206,6 +206,7 @@@ set(SR
    geometry/nodes/node_geo_raycast.cc
    geometry/nodes/node_geo_select_by_material.cc
    geometry/nodes/node_geo_separate_components.cc
 +  geometry/nodes/node_geo_solidify.cc
-   geometry/nodes/node_geo_subdivide.cc
    geometry/nodes/node_geo_subdivision_surface.cc
    geometry/nodes/node_geo_switch.cc
    geometry/nodes/node_geo_transform.cc
diff --cc source/blender/nodes/NOD_geometry.h
index 8e32a3df724,ad3a838f4c0..63f6d289342
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@@ -85,8 -94,6 +94,7 @@@ void register_node_type_geo_raycast(voi
  void register_node_type_geo_sample_texture(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_subdivide(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 1af75d6efe8,73d4a002991..6417e9f87b3
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@@ -323,8 -332,7 +332,8 @@@ 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_SUBDIVIDE, 0, "SUBDIVIDE", Subdivide, "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", "")