1berry/blender
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Geometry Nodes: Reorganize Add Menu

Browse Source 
- Move Converters to 'From' menus
  - Create Instances Menu
  - Realphabetize the Curve Menu

  Differential Revision: https://developer.blender.org/D12860
This commit is contained in:
Johnny Matthews 2021-10-14 06:41:52 -05:00
parent 56b35991bc
commit 9ca567bc4e
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
release/scripts/startup/nodeitems_builtins.py
View File

@ -101,15 +101,15 @@ def curve_node_items(context):
yield NodeItem("GeometryNodeLegacyCurveSplineType") yield NodeItem("GeometryNodeLegacyCurveSplineType")
yield NodeItemCustom(draw=lambda self, layout, context: layout.separator()) yield NodeItemCustom(draw=lambda self, layout, context: layout.separator())
yield NodeItem("GeometryNodeCurveLength")
yield NodeItem("GeometryNodeCurveToMesh")
yield NodeItem("GeometryNodeCurveFill") yield NodeItem("GeometryNodeCurveFill")
yield NodeItem("GeometryNodeCurveFillet") yield NodeItem("GeometryNodeCurveFillet")
yield NodeItem("GeometryNodeCurveLength") yield NodeItem("GeometryNodeCurveResample")
yield NodeItem("GeometryNodeCurveReverse") yield NodeItem("GeometryNodeCurveReverse")
yield NodeItem("GeometryNodeCurveSample") yield NodeItem("GeometryNodeCurveSample")
yield NodeItem("GeometryNodeCurveSubdivide") yield NodeItem("GeometryNodeCurveSubdivide")
yield NodeItem("GeometryNodeCurveToMesh")
yield NodeItem("GeometryNodeCurveTrim") yield NodeItem("GeometryNodeCurveTrim")
yield NodeItem("GeometryNodeCurveResample")
yield NodeItemCustom(draw=lambda self, layout, context: layout.separator()) yield NodeItemCustom(draw=lambda self, layout, context: layout.separator())
yield NodeItem("GeometryNodeInputCurveHandlePositions") yield NodeItem("GeometryNodeInputCurveHandlePositions")
yield NodeItem("GeometryNodeCurveParameter") yield NodeItem("GeometryNodeCurveParameter")
@ -128,7 +128,7 @@ def curve_node_items(context):
yield NodeItem("GeometryNodeSetSplineResolution") yield NodeItem("GeometryNodeSetSplineResolution")
yield NodeItem("GeometryNodeCurveSplineType") yield NodeItem("GeometryNodeCurveSplineType")
# Custom Menu for Geometry Node Curves # Custom Menu for Geometry Node Mesh
def mesh_node_items(context): def mesh_node_items(context):
if context is None: if context is None:
return return
@ -145,8 +145,8 @@ def mesh_node_items(context):
yield NodeItem("GeometryNodeEdgeSplit") yield NodeItem("GeometryNodeEdgeSplit")
yield NodeItem("GeometryNodeBoolean") yield NodeItem("GeometryNodeBoolean")
yield NodeItem("GeometryNodeMeshToPoints")
yield NodeItem("GeometryNodeMeshSubdivide") yield NodeItem("GeometryNodeMeshSubdivide")
yield NodeItem("GeometryNodePointsToVertices")
yield NodeItem("GeometryNodeTriangulate") yield NodeItem("GeometryNodeTriangulate")
yield NodeItemCustom(draw=lambda self, layout, context: layout.separator()) yield NodeItemCustom(draw=lambda self, layout, context: layout.separator())
yield NodeItem("GeometryNodeInputShadeSmooth") yield NodeItem("GeometryNodeInputShadeSmooth")
@ -181,7 +181,7 @@ def geometry_input_node_items(context):
yield NodeItem("GeometryNodeInputPosition") yield NodeItem("GeometryNodeInputPosition")
yield NodeItem("GeometryNodeInputRadius") yield NodeItem("GeometryNodeInputRadius")
# Custom Menu for Material Node Input Nodes # Custom Menu for Material Nodes
def geometry_material_node_items(context): def geometry_material_node_items(context):
if context is None: if context is None:
return return
@ -204,7 +204,7 @@ def geometry_material_node_items(context):
yield NodeItem("GeometryNodeSetMaterial") yield NodeItem("GeometryNodeSetMaterial")
yield NodeItem("GeometryNodeSetMaterialIndex") yield NodeItem("GeometryNodeSetMaterialIndex")
# Custom Menu for Geometry Node Curves # Custom Menu for Geometry Node Points
def point_node_items(context): def point_node_items(context):
if context is None: if context is None:
return return
@ -225,8 +225,8 @@ def point_node_items(context):
yield NodeItemCustom(draw=lambda self, layout, context: layout.separator()) yield NodeItemCustom(draw=lambda self, layout, context: layout.separator())
yield NodeItem("GeometryNodeDistributePointsOnFaces") yield NodeItem("GeometryNodeDistributePointsOnFaces")
yield NodeItem("GeometryNodeInstanceOnPoints") yield NodeItem("GeometryNodePointsToVertices")
yield NodeItem("GeometryNodeMeshToPoints") yield NodeItem("GeometryNodePointsToVolume")
yield NodeItemCustom(draw=lambda self, layout, context: layout.separator()) yield NodeItemCustom(draw=lambda self, layout, context: layout.separator())
yield NodeItemCustom(draw=lambda self, layout, context: layout.separator()) yield NodeItemCustom(draw=lambda self, layout, context: layout.separator())
yield NodeItem("GeometryNodeSetPointRadius") yield NodeItem("GeometryNodeSetPointRadius")
@ -683,12 +683,15 @@ geometry_node_categories = [
NodeItem("GeometryNodeSeparateComponents"), NodeItem("GeometryNodeSeparateComponents"),
NodeItem("GeometryNodeSeparateGeometry"), NodeItem("GeometryNodeSeparateGeometry"),
NodeItem("GeometryNodeSetPosition"), NodeItem("GeometryNodeSetPosition"),
]),
GeometryNodeCategory("GEO_INPUT", "Input", items=geometry_input_node_items),
GeometryNodeCategory("GEO_INSTANCE", "Instances", items=[
NodeItem("GeometryNodeInstanceOnPoints"),
NodeItem("GeometryNodeRealizeInstances"), NodeItem("GeometryNodeRealizeInstances"),
NodeItem("GeometryNodeRotateInstances"), NodeItem("GeometryNodeRotateInstances"),
NodeItem("GeometryNodeScaleInstances"), NodeItem("GeometryNodeScaleInstances"),
NodeItem("GeometryNodeTranslateInstances"), NodeItem("GeometryNodeTranslateInstances"),
]), ]),
GeometryNodeCategory("GEO_INPUT", "Input", items=geometry_input_node_items),
GeometryNodeCategory("GEO_MATERIAL", "Material", items=geometry_material_node_items), GeometryNodeCategory("GEO_MATERIAL", "Material", items=geometry_material_node_items),
GeometryNodeCategory("GEO_MESH", "Mesh", items=mesh_node_items), GeometryNodeCategory("GEO_MESH", "Mesh", items=mesh_node_items),
GeometryNodeCategory("GEO_PRIMITIVES_MESH", "Mesh Primitives", items=[ GeometryNodeCategory("GEO_PRIMITIVES_MESH", "Mesh Primitives", items=[
@ -739,7 +742,6 @@ geometry_node_categories = [
GeometryNodeCategory("GEO_VOLUME", "Volume", items=[ GeometryNodeCategory("GEO_VOLUME", "Volume", items=[
NodeItem("GeometryNodeLegacyPointsToVolume", poll=geometry_nodes_legacy_poll), NodeItem("GeometryNodeLegacyPointsToVolume", poll=geometry_nodes_legacy_poll),
NodeItem("GeometryNodePointsToVolume"),
NodeItem("GeometryNodeVolumeToMesh"), NodeItem("GeometryNodeVolumeToMesh"),
]), ]),
GeometryNodeCategory("GEO_GROUP", "Group", items=node_group_items), GeometryNodeCategory("GEO_GROUP", "Group", items=node_group_items),