[Bf-blender-cvs] [d85d59afc98] soc-2021-porting-modifiers-to-nodes-decimate: Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-decimate

[Fabian Schempp]

Commit: d85d59afc98b77c30df6aa77be2abdcd8ca20157
Author: Fabian Schempp
Date:   Fri Jul 2 21:57:53 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-decimate
https://developer.blender.org/rBd85d59afc98b77c30df6aa77be2abdcd8ca20157

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

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

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



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

diff --cc release/scripts/startup/nodeitems_builtins.py
index f491e76a16f,c85d7a9db04..e0cc770323b
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@@ -539,12 -546,8 +546,12 @@@ geometry_node_categories = 
          NodeItem("GeometryNodeEdgeSplit"),
          NodeItem("GeometryNodeSubdivisionSurface"),
          NodeItem("GeometryNodeSubdivide"),
 +        NodeItem("GeometryNodeDecimate"),
 +        NodeItem("GeometryNodeCollapse"),
 +        NodeItem("GeometryNodeUnsubdivide"),
 +        NodeItem("GeometryNodeDissolve"),
      ]),
-     GeometryNodeCategory("GEO_PRIMITIVES", "Mesh Primitives", items=[
+     GeometryNodeCategory("GEO_PRIMITIVES_MESH", "Mesh Primitives", items=[
          NodeItem("GeometryNodeMeshCircle"),
          NodeItem("GeometryNodeMeshCone"),
          NodeItem("GeometryNodeMeshCube"),
diff --cc source/blender/blenkernel/BKE_node.h
index 868d154f21e,3562a3e8d63..fb8361dbaf0
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1439,9 -1439,12 +1439,14 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_SEPARATE_COMPONENTS 1059
  #define GEO_NODE_CURVE_SUBDIVIDE 1060
  #define GEO_NODE_RAYCAST 1061
- #define GEO_NODE_COLLAPSE 1062
- #define GEO_NODE_UNSUBDIVIDE 1063
- #define GEO_NODE_DISSOLVE 1064
+ #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_COLLAPSE 1067
++#define GEO_NODE_UNSUBDIVIDE 1068
++#define GEO_NODE_DISSOLVE 1069
  /** \} */
  
  /* -------------------------------------------------------------------- */
diff --cc source/blender/nodes/CMakeLists.txt
index 863b6efb897,77d2f043b64..65077264000
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@@ -164,7 -163,12 +164,12 @@@ set(SR
    geometry/nodes/node_geo_collection_info.cc
    geometry/nodes/node_geo_common.cc
    geometry/nodes/node_geo_convex_hull.cc
 -  geometry/nodes/node_geo_curve_length.cc  
 +  geometry/nodes/node_geo_curve_length.cc
+   geometry/nodes/node_geo_curve_primitive_bezier_segment.cc
+   geometry/nodes/node_geo_curve_primitive_circle.cc
+   geometry/nodes/node_geo_curve_primitive_quadratic_bezier.cc
+   geometry/nodes/node_geo_curve_primitive_spiral.cc
+   geometry/nodes/node_geo_curve_primitive_star.cc
    geometry/nodes/node_geo_curve_to_mesh.cc
    geometry/nodes/node_geo_curve_to_points.cc
    geometry/nodes/node_geo_curve_resample.cc