[Bf-blender-cvs] [fbf093dee11] geometry-nodes-mesh-primitives: Merge branch 'master' into geometry-nodes-mesh-primitives

[Hans Goudey]

Commit: fbf093dee11f4bba00c66bbbdd1930a252369f06
Author: Hans Goudey
Date:   Sat Feb 20 17:22:16 2021 -0600
Branches: geometry-nodes-mesh-primitives
https://developer.blender.org/rBfbf093dee11f4bba00c66bbbdd1930a252369f06

Merge branch 'master' into geometry-nodes-mesh-primitives

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



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

diff --cc release/scripts/startup/nodeitems_builtins.py
index 55578f345cf,ba0a22af0d1..bc7ef0f18c5
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@@ -516,17 -517,7 +517,18 @@@ geometry_node_categories = 
          NodeItem("GeometryNodeTriangulate"),
          NodeItem("GeometryNodeEdgeSplit"),
          NodeItem("GeometryNodeSubdivisionSurface"),
 +        # GeometryNodeCategory("GEO_MESH_PRIMITIVES", "Primitives", items=[
 +        NodeItem("GeometryNodeMeshPlane"),
 +        NodeItem("GeometryNodeMeshCube"),
 +        NodeItem("GeometryNodeMeshCircle"),
 +        NodeItem("GeometryNodeMeshUVSphere"),
 +        NodeItem("GeometryNodeMeshIcoSphere"),
 +        NodeItem("GeometryNodeMeshCylinder"),
 +        NodeItem("GeometryNodeMeshCone"),
 +        NodeItem("GeometryNodeMeshTorus"),
 +        NodeItem("GeometryNodeMeshGrid"),
 +        # ]),
+         NodeItem("GeometryNodeSubdivisionSurfaceSimple"),
      ]),
      GeometryNodeCategory("GEO_POINT", "Point", items=[
          NodeItem("GeometryNodePointDistribute"),
diff --cc source/blender/blenkernel/BKE_node.h
index 6bd7f8cb504,8652adecaf9..81c45776bd0
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1372,8 -1372,7 +1372,9 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_VOLUME_TO_MESH 1026
  #define GEO_NODE_ATTRIBUTE_COMBINE_XYZ 1027
  #define GEO_NODE_ATTRIBUTE_SEPARATE_XYZ 1028
- #define GEO_NODE_MESH_PRIMITIVE_CUBE 1029
- #define GEO_NODE_MESH_PRIMITIVE_CIRCLE 1030
+ #define GEO_NODE_SUBDIVISION_SURFACE_SIMPLE 1029
++#define GEO_NODE_MESH_PRIMITIVE_CUBE 1030
++#define GEO_NODE_MESH_PRIMITIVE_CIRCLE 1031
  
  /** \} */
  
diff --cc source/blender/nodes/NOD_static_types.h
index 5ab21017922,35550bdec48..5bebec5c56d
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@@ -297,8 -298,7 +298,9 @@@ DefNode(GeometryNode, GEO_NODE_ATTRIBUT
  DefNode(GeometryNode, GEO_NODE_VOLUME_TO_MESH, def_geo_volume_to_mesh, "VOLUME_TO_MESH", VolumeToMesh, "Volume to Mesh", "")
  DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_COMBINE_XYZ, def_geo_attribute_combine_xyz, "ATTRIBUTE_COMBINE_XYZ", AttributeCombineXYZ, "Attribute Combine XYZ", "")
  DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_SEPARATE_XYZ, def_geo_attribute_separate_xyz, "ATTRIBUTE_SEPARATE_XYZ", AttributeSeparateXYZ, "Attribute Separate XYZ", "")
+ DefNode(GeometryNode, GEO_NODE_SUBDIVISION_SURFACE_SIMPLE, 0, "SUBDIVISION_SURFACE_SIMPLE", SubdivisionSurfaceSimple, "Simple Subdivision Surface", "")
 +DefNode(GeometryNode, GEO_NODE_MESH_PRIMITIVE_CUBE, 0, "MESH_PRIMITIVE_CUBE", MeshCube, "Cube", "")
 +DefNode(GeometryNode, GEO_NODE_MESH_PRIMITIVE_CIRCLE, def_geo_mesh_circle, "MESH_PRIMITIVE_CIRCLE", MeshCircle, "Circle", "")
  
  /* undefine macros */
  #undef DefNode