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

[Fabian Schempp]

Commit: a1b78085e398c06b0bf03dcd52ca364dc9681d60
Author: Fabian Schempp
Date:   Sat Jan 29 21:42:14 2022 +0100
Branches: soc-2021-porting-modifiers-to-nodes-decimate
https://developer.blender.org/rBa1b78085e398c06b0bf03dcd52ca364dc9681d60

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

# Conflicts:
#	release/scripts/startup/nodeitems_builtins.py
#	source/blender/blenkernel/BKE_node.h
#	source/blender/blenkernel/intern/node.cc
#	source/blender/makesdna/DNA_node_types.h
#	source/blender/makesrna/intern/rna_nodetree.c
#	source/blender/nodes/CMakeLists.txt
#	source/blender/nodes/NOD_geometry.h
#	source/blender/nodes/NOD_static_types.h

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



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

diff --cc release/scripts/startup/nodeitems_builtins.py
index 7a1c2c0a859,f6ca200f570..cd8cd6d9f1b
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@@ -80,6 -80,189 +80,192 @@@ node_tree_group_type = 
      'GeometryNodeTree': 'GeometryNodeGroup',
  }
  
+ # Custom Menu for Geometry Node Curves
+ def curve_node_items(context):
+     if context is None:
+         return
+     space = context.space_data
+     if not space:
+         return
+ 
+     if geometry_nodes_legacy_poll(context):
+         yield NodeItem("GeometryNodeLegacyCurveEndpoints")
+         yield NodeItem("GeometryNodeLegacyCurveReverse")
+         yield NodeItem("GeometryNodeLegacyCurveSubdivide")
+         yield NodeItem("GeometryNodeLegacyCurveToPoints")
+         yield NodeItem("GeometryNodeLegacyMeshToCurve")
+         yield NodeItem("GeometryNodeLegacyCurveSelectHandles")
+         yield NodeItem("GeometryNodeLegacyCurveSetHandles")
+         yield NodeItem("GeometryNodeLegacyCurveSplineType")
+         yield NodeItemCustom(draw=lambda self, layout, context: layout.separator())
+ 
+     yield NodeItem("GeometryNodeCurveLength")
+     yield NodeItem("GeometryNodeCurveToMesh")
+     yield NodeItem("GeometryNodeCurveToPoints")
+     yield NodeItem("GeometryNodeFillCurve")
+     yield NodeItem("GeometryNodeFilletCurve")
+     yield NodeItem("GeometryNodeResampleCurve")
+     yield NodeItem("GeometryNodeReverseCurve")
+     yield NodeItem("GeometryNodeSampleCurve")
+     yield NodeItem("GeometryNodeSubdivideCurve")
+     yield NodeItem("GeometryNodeTrimCurve")
+     yield NodeItemCustom(draw=lambda self, layout, context: layout.separator())
+     yield NodeItem("GeometryNodeInputCurveHandlePositions")
+     yield NodeItem("GeometryNodeInputTangent")
+     yield NodeItem("GeometryNodeInputCurveTilt")
+     yield NodeItem("GeometryNodeCurveEndpointSelection")
+     yield NodeItem("GeometryNodeCurveHandleTypeSelection")
+     yield NodeItem("GeometryNodeInputSplineCyclic")
+     yield NodeItem("GeometryNodeSplineLength")
+     yield NodeItem("GeometryNodeSplineParameter")
+     yield NodeItem("GeometryNodeInputSplineResolution")
+     yield NodeItemCustom(draw=lambda self, layout, context: layout.separator())
+     yield NodeItem("GeometryNodeSetCurveRadius")
+     yield NodeItem("GeometryNodeSetCurveTilt")
+     yield NodeItem("GeometryNodeSetCurveHandlePositions")
+     yield NodeItem("GeometryNodeCurveSetHandles")
+     yield NodeItem("GeometryNodeSetSplineCyclic")
+     yield NodeItem("GeometryNodeSetSplineResolution")
+     yield NodeItem("GeometryNodeCurveSplineType")
+ 
+ # Custom Menu for Geometry Node Mesh
+ def mesh_node_items(context):
+     if context is None:
+         return
+     space = context.space_data
+     if not space:
+         return
+ 
+     if geometry_nodes_legacy_poll(context):
+         yield NodeItem("GeometryNodeLegacyEdgeSplit", poll=geometry_nodes_legacy_poll)
+         yield NodeItem("GeometryNodeLegacySubdivisionSurface", poll=geometry_nodes_legacy_poll)
+         yield NodeItemCustom(draw=lambda self, layout, context: layout.separator())
+ 
+     yield NodeItem("GeometryNodeDualMesh")
+     yield NodeItem("GeometryNodeMeshBoolean")
+     yield NodeItem("GeometryNodeMeshToCurve")
+     yield NodeItem("GeometryNodeMeshToPoints")
+     yield NodeItem("GeometryNodeSplitEdges")
+     yield NodeItem("GeometryNodeSubdivideMesh")
+     yield NodeItem("GeometryNodeSubdivisionSurface")
 -    yield NodeItem("GeometryNodeTriangulate")
++    yield NodeItem("GeometryNodeTriangulate"),
++    yield NodeItem("GeometryNodeCollapse"),
++    yield NodeItem("GeometryNodeUnsubdivide"),
++    yield NodeItem("GeometryNodeDissolve"),
+     yield NodeItemCustom(draw=lambda self, layout, context: layout.separator())
+     yield NodeItem("GeometryNodeInputMeshEdgeAngle")
+     yield NodeItem("GeometryNodeInputMeshEdgeNeighbors")
+     yield NodeItem("GeometryNodeInputMeshEdgeVertices")
+     yield NodeItem("GeometryNodeInputMeshFaceArea")
+     yield NodeItem("GeometryNodeInputMeshFaceNeighbors")
+     yield NodeItem("GeometryNodeInputMeshIsland")
+     yield NodeItem("GeometryNodeInputShadeSmooth")
+     yield NodeItem("GeometryNodeInputMeshVertexNeighbors")
+     yield NodeItemCustom(draw=lambda self, layout, context: layout.separator())
+     yield NodeItem("GeometryNodeSetShadeSmooth")
+ 
+ # Custom Menu for Geometry Nodes "Geometry" category
+ def geometry_node_items(context):
+     if context is None:
+         return
+     space = context.space_data
+     if not space:
+         return
+ 
+     if geometry_nodes_legacy_poll(context):
+         yield NodeItem("GeometryNodeLegacyDeleteGeometry", poll=geometry_nodes_legacy_poll)
+         yield NodeItem("GeometryNodeLegacyRaycast", poll=geometry_nodes_legacy_poll)
+         yield NodeItemCustom(draw=lambda self, layout, context: layout.separator())
+ 
+     yield NodeItem("GeometryNodeBoundBox")
+     yield NodeItem("GeometryNodeConvexHull")
+     yield NodeItem("GeometryNodeDeleteGeometry")
+     yield NodeItem("GeometryNodeGeometryToInstance")
+     yield NodeItem("GeometryNodeProximity")
+     yield NodeItem("GeometryNodeJoinGeometry")
+     yield NodeItem("GeometryNodeRaycast")
+     yield NodeItem("GeometryNodeSeparateComponents")
+     yield NodeItem("GeometryNodeSeparateGeometry")
+     yield NodeItem("GeometryNodeTransform")
+     yield NodeItemCustom(draw=lambda self, layout, context: layout.separator())
+     yield NodeItem("GeometryNodeSetID")
+     yield NodeItem("GeometryNodeSetPosition")
+ 
+ # Custom Menu for Geometry Node Input Nodes
+ def geometry_input_node_items(context):
+     if context is None:
+         return
+     space = context.space_data
+     if not space:
+         return
+ 
+     if geometry_nodes_legacy_poll(context):
+         yield NodeItem("FunctionNodeLegacyRandomFloat")
+         yield NodeItemCustom(draw=lambda self, layout, context: layout.separator())
+ 
+     yield NodeItem("FunctionNodeInputBool")
+     yield NodeItem("GeometryNodeCollectionInfo")
+     yield NodeItem("FunctionNodeInputColor")
+     yield NodeItem("FunctionNodeInputInt")
+     yield NodeItem("GeometryNodeIsViewport")
+     yield NodeItem("GeometryNodeInputMaterial")
+     yield NodeItem("GeometryNodeObjectInfo")
+     yield NodeItem("FunctionNodeInputString")
+     yield NodeItem("ShaderNodeValue")
+     yield NodeItem("FunctionNodeInputVector")
+     yield NodeItemCustom(draw=lambda self, layout, context: layout.separator())
+     yield NodeItem("GeometryNodeInputID")
+     yield NodeItem("GeometryNodeInputIndex")
+     yield NodeItem("GeometryNodeInputNormal")
+     yield NodeItem("GeometryNodeInputPosition")
+     yield NodeItem("GeometryNodeInputRadius")
+     yield NodeItem("GeometryNodeInputSceneTime")
+ 
+ # Custom Menu for Material Nodes
+ def geometry_material_node_items(context):
+     if context is None:
+         return
+     space = context.space_data
+     if not space:
+         return
+ 
+     if geometry_nodes_legacy_poll(context):
+         yield NodeItem("GeometryNodeLegacyMaterialAssign")
+         yield NodeItem("GeometryNodeLegacySelectByMaterial")
+         yield NodeItemCustom(draw=lambda self, layout, context: layout.separator())
+ 
+     yield NodeItem("GeometryNodeReplaceMaterial")
+     yield NodeItemCustom(draw=lambda self, layout, context: layout.separator())
+     yield NodeItem("GeometryNodeInputMaterialIndex")
+     yield NodeItem("GeometryNodeMaterialSelection")
+     yield NodeItemCustom(draw=lambda self, layout, context: layout.separator())
+     yield NodeItem("GeometryNodeSetMaterial")
+     yield NodeItem("GeometryNodeSetMaterialIndex")
+ 
+ # Custom Menu for Geometry Node Points
+ def point_node_items(context):
+     if context is None:
+         return
+     space = context.space_data
+     if not space:
+         return
+ 
+     if geometry_nodes_legacy_poll(context):
+         yield NodeItem("GeometryNodeLegacyAlignRotationToVector", poll=geometry_nodes_legacy_poll)
+         yield NodeItem("GeometryNodeLegacyPointDistribute", poll=geometry_nodes_legacy_poll)
+         yield NodeItem("GeometryNodeLegacyPointInstance", poll=geometry_nodes_legacy_poll)
+         yield NodeItem("GeometryNodeLegacyPointScale", poll=geometry_nodes_legacy_poll)
+         yield NodeItem("GeometryNodeLegacyPointSeparate", poll=geometry_nodes_legacy_poll)
+         yield NodeItem("GeometryNodeLegacyPointTranslate", poll=geometry_nodes_legacy_poll)
+         yield NodeItem("GeometryNodeLegacyRotatePoints", poll=geometry_nodes_legacy_poll)
+         yield NodeItemCustom(draw=lambda self, layout, context: layout.separator())
+ 
+     yield NodeItem("GeometryNodeDistributePointsOnFaces")
+     yield NodeItem("GeometryNodePointsToVertices")
+     yield NodeItem("GeometryNodePointsToVolume")
+     yield NodeItemCustom(draw=lambda self, layout, context: layout.separator())
+     yield NodeItemCustom(draw=lambda self, layout, context: layout.separator())
+     yield NodeItem("GeometryNodeSetPointRadius")
  
  # generic node group items generator for shader, compositor, geometry and texture node groups
  def node_group_items(context):
diff --cc source/blender/blenkernel/BKE_node.h
index 14448bd7c85,a76fe2f83e0..835d2633d8a
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1471,15 -1550,85 +1550,87 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_CURVE_PRIMITIVE_CIRCLE 1066
  #define GEO_NODE_VIEWER 1067
  #define GEO_NODE_CURVE_PRIMITIVE_LINE 1068
- #define GEO_NODE_CURVE_ENDPOINTS 1069
+ #define GEO_NODE_LEGACY_CURVE_ENDPOINTS 1069
  #define GEO_NODE_CURVE_PRIMITIVE_QUADRILATERAL 1070
- #define GEO_NODE_CURVE_TRIM 1071
- #define GEO_NODE_CURVE_SET_HANDLES 1072
- #define GEO_NODE_CURVE_SPLINE_TYPE 1073
- #define GEO_NODE_CURVE_SELECT_HANDLES 1074
- #define GEO_NODE_COLLAPSE 1075
- #define GEO_NODE_UNSUBDIVIDE 1076
- #define GEO_NODE_DISSOLVE 1077
+ #define GEO_NODE_TRIM_CURVE 1071
+ #define GEO_NODE_LEGACY_CURVE_SET_HANDLES 1072
+ #define GEO_NODE_LEGACY_CURVE_SPLINE_TYPE 1073
+ #define GEO_NODE_LEGACY_CURVE_SELECT_HANDLES 1074
+ #define GEO_NODE_FILL_CURVE 1075
+ #define GEO_NODE_INPUT_POSITION

@@ Diff output truncated at 10240 characters. @@