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

[Fabian Schempp]

Commit: 7d694de051bb5419d76d56e2658b06b91ae134c1
Author: Fabian Schempp
Date:   Sat Jan 29 21:47:38 2022 +0100
Branches: soc-2021-porting-modifiers-to-nodes-decimate
https://developer.blender.org/rB7d694de051bb5419d76d56e2658b06b91ae134c1

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

# Conflicts:
#	release/scripts/startup/nodeitems_builtins.py
#	source/blender/blenkernel/BKE_node.h

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



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

diff --cc release/scripts/startup/nodeitems_builtins.py
index cd8cd6d9f1b,b841cb5dd13..cb43147bc4b
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@@ -148,10 -150,8 +150,11 @@@ def mesh_node_items(context)
      yield NodeItem("GeometryNodeSplitEdges")
      yield NodeItem("GeometryNodeSubdivideMesh")
      yield NodeItem("GeometryNodeSubdivisionSurface")
-     yield NodeItem("GeometryNodeTriangulate"),
-     yield NodeItem("GeometryNodeCollapse"),
-     yield NodeItem("GeometryNodeUnsubdivide"),
-     yield NodeItem("GeometryNodeDissolve"),
+     yield NodeItem("GeometryNodeTriangulate")
+     yield NodeItem("GeometryNodeScaleElements")
++    yield NodeItem("GeometryNodeCollapse")
++    yield NodeItem("GeometryNodeUnsubdivide")
++    yield NodeItem("GeometryNodeDissolve")
      yield NodeItemCustom(draw=lambda self, layout, context: layout.separator())
      yield NodeItem("GeometryNodeInputMeshEdgeAngle")
      yield NodeItem("GeometryNodeInputMeshEdgeNeighbors")
diff --cc source/blender/blenkernel/BKE_node.h
index 835d2633d8a,16d8ba2e6dd..46629ce09a2
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1628,9 -1518,13 +1518,15 @@@ struct TexResult
  #define GEO_NODE_INPUT_SCENE_TIME 1145
  #define GEO_NODE_ACCUMULATE_FIELD 1146
  #define GEO_NODE_INPUT_MESH_EDGE_ANGLE 1147
- #define GEO_NODE_COLLAPSE 1148
- #define GEO_NODE_UNSUBDIVIDE 1149
- #define GEO_NODE_DISSOLVE 1150
+ #define GEO_NODE_FIELD_AT_INDEX 1148
+ #define GEO_NODE_CURVE_PRIMITIVE_ARC 1149
+ #define GEO_NODE_FLIP_FACES 1150
+ #define GEO_NODE_SCALE_ELEMENTS 1151
+ #define GEO_NODE_EXTRUDE_MESH 1152
+ #define GEO_NODE_MERGE_BY_DISTANCE 1153
 -
++#define GEO_NODE_COLLAPSE 1154
++#define GEO_NODE_UNSUBDIVIDE 1155
++#define GEO_NODE_DISSOLVE 1156
  /** \} */
  
  /* -------------------------------------------------------------------- */
diff --cc source/blender/blenkernel/intern/node.cc
index 13a35005c26,40d0c24c9af..080090dc59e
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@@ -4767,8 -4768,10 +4769,11 @@@ static void registerGeometryNodes(
    register_node_type_geo_delete_geometry();
    register_node_type_geo_distribute_points_on_faces();
    register_node_type_geo_dual_mesh();
 +  register_node_type_geo_dissolve();
    register_node_type_geo_edge_split();
+   register_node_type_geo_extrude_mesh();
+   register_node_type_geo_field_at_index();
+   register_node_type_geo_flip_faces();
    register_node_type_geo_geometry_to_instance();
    register_node_type_geo_image_texture();
    register_node_type_geo_input_curve_handles();