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

[Hans Goudey]

Commit: 1f95b07b3250cd9135703f3da8eaf7f8e0fd17c6
Author: Hans Goudey
Date:   Mon Mar 8 16:56:18 2021 -0500
Branches: geometry-nodes-mesh-primitives
https://developer.blender.org/rB1f95b07b3250cd9135703f3da8eaf7f8e0fd17c6

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

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



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

diff --cc release/scripts/startup/nodeitems_builtins.py
index bc7ef0f18c5,83e72e6f84c..41538fdb1a7
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@@ -516,19 -516,8 +516,21 @@@ geometry_node_categories = 
          NodeItem("GeometryNodeBoolean"),
          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"),
+         NodeItem("GeometryNodeSubdivideSmooth"),
+         NodeItem("GeometryNodeSubdivide"),
      ]),
      GeometryNodeCategory("GEO_POINT", "Point", items=[
          NodeItem("GeometryNodePointDistribute"),
diff --cc source/blender/blenkernel/BKE_node.h
index 91edcd95aed,f5f65e71f7f..3fcdebbd7fd
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1371,11 -1371,7 +1371,11 @@@ 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_SUBDIVISION_SURFACE_SIMPLE 1029
+ #define GEO_NODE_SUBDIVIDE 1029
 +#define GEO_NODE_MESH_PRIMITIVE_CUBE 1030
 +#define GEO_NODE_MESH_PRIMITIVE_CIRCLE 1031
 +#define GEO_NODE_MESH_PRIMITIVE_UV_SPHERE 1032
 +#define GEO_NODE_MESH_PRIMITIVE_CYLINDER 1033
  
  /** \} */
  
diff --cc source/blender/nodes/NOD_static_types.h
index b61eb1b5c03,22204d7204e..4d8dd92ee60
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@@ -298,11 -298,7 +298,11 @@@ 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_SUBDIVIDE, 0, "SUBDIVIDE", Subdivide, "Subdivide", "")
 +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", "")
 +DefNode(GeometryNode, GEO_NODE_MESH_PRIMITIVE_UV_SPHERE, 0, "MESH_PRIMITIVE_UV_SPHERE", MeshUVSphere, "UV Sphere", "")
 +DefNode(GeometryNode, GEO_NODE_MESH_PRIMITIVE_CYLINDER, def_geo_mesh_cylinder, "MESH_PRIMITIVE_CYLINDER", MeshCylinder, "Cylinder", "")
  
  /* undefine macros */
  #undef DefNode