[Bf-blender-cvs] [9934a711721] geometry-nodes-mesh-primitives: Cleanup, revert some changes

[Hans Goudey]

Commit: 9934a711721332624cb1b73fab37813c4cba7c3b
Author: Hans Goudey
Date:   Sat Mar 13 17:31:39 2021 -0500
Branches: geometry-nodes-mesh-primitives
https://developer.blender.org/rB9934a711721332624cb1b73fab37813c4cba7c3b

Cleanup, revert some changes

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

M	release/scripts/startup/nodeitems_builtins.py
M	source/blender/makesdna/DNA_node_types.h

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

diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py
index cdbd016bb9e..8d97cc8bf00 100644
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@ -520,16 +520,15 @@ geometry_node_categories = [
         NodeItem("GeometryNodeSubdivideSmooth"),
         NodeItem("GeometryNodeSubdivide"),
 
-        # These should be in a submenu, but that requires refactoring to remove NodeItem.
-        NodeItem("GeometryNodeMeshPlane"),
+        # These should be in a submenu, but that requires a refactor to build the add menu manually.
         NodeItem("GeometryNodeMeshCube"),
         NodeItem("GeometryNodeMeshCircle"),
         NodeItem("GeometryNodeMeshUVSphere"),
         NodeItem("GeometryNodeMeshIcoSphere"),
         NodeItem("GeometryNodeMeshCylinder"),
         NodeItem("GeometryNodeMeshCone"),
-        NodeItem("GeometryNodeMeshTorus"),
-        NodeItem("GeometryNodeMeshGrid"),
+        # NodeItem("GeometryNodeMeshPlane"),
+        # NodeItem("GeometryNodeMeshGrid"),
     ]),
     GeometryNodeCategory("GEO_POINT", "Point", items=[
         NodeItem("GeometryNodePointDistribute"),
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index 96f1d9e25de..9a4b52b6782 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -1221,6 +1221,11 @@ typedef struct NodeAttributeCombineXYZ {
   char _pad[1];
 } NodeAttributeCombineXYZ;
 
+typedef struct NodeAttributeSeparateXYZ {
+  /* GeometryNodeAttributeInputMode. */
+  uint8_t input_type;
+} NodeAttributeSeparateXYZ;
+
 typedef struct NodeAttributeConvert {
   /* CustomDataType. */
   uint8_t data_type;
@@ -1229,11 +1234,6 @@ typedef struct NodeAttributeConvert {
   int16_t domain;
 } NodeAttributeConvert;
 
-typedef struct NodeAttributeSeparateXYZ {
-  /* GeometryNodeAttributeInputMode. */
-  uint8_t input_type;
-} NodeAttributeSeparateXYZ;
-
 typedef struct NodeGeometryMeshCircle {
   /* GeometryNodeMeshCircleFillType. */
   uint8_t fill_type;