[Bf-blender-cvs] [844d9759726] soc-2021-porting-modifiers-to-nodes_all: Merge branch 'soc-2021-porting-modifiers-to-nodes-extrude-and-move' into soc-2021-porting-modifiers-to-nodes

[Fabian Schempp]

Commit: 844d97597261397e962058ae4d69d2cfa860c619
Author: Fabian Schempp
Date:   Tue Aug 17 22:35:07 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes_all
https://developer.blender.org/rB844d97597261397e962058ae4d69d2cfa860c619

Merge branch 'soc-2021-porting-modifiers-to-nodes-extrude-and-move' into soc-2021-porting-modifiers-to-nodes

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

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



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

diff --cc release/scripts/startup/nodeitems_builtins.py
index 5d0c9218e5a,b7e42ed8a0d..a7e70b70f7d
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@@ -553,10 -553,7 +553,11 @@@ geometry_node_categories = 
          NodeItem("GeometryNodeEdgeSplit"),
          NodeItem("GeometryNodeSubdivisionSurface"),
          NodeItem("GeometryNodeMeshSubdivide"),
+         NodeItem("GeometryNodeMeshExtrude"),
 +        NodeItem("GeometryNodeMeshInset"),
 +        NodeItem("GeometryNodeCollapse"),
 +        NodeItem("GeometryNodeUnsubdivide"),
 +        NodeItem("GeometryNodeDissolve"),
      ]),
      GeometryNodeCategory("GEO_PRIMITIVES_MESH", "Mesh Primitives", items=[
          NodeItem("GeometryNodeMeshCircle"),
diff --cc source/blender/blenkernel/BKE_node.h
index 94a64694601,20c5311d944..c2809833996
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1476,11 -1476,9 +1476,13 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_CURVE_TRIM 1071
  #define GEO_NODE_CURVE_SET_HANDLES 1072
  #define GEO_NODE_CURVE_SPLINE_TYPE 1073
- #define GEO_NODE_MESH_INSET 1074
- #define GEO_NODE_CURVE_SELECT_HANDLES 1075
- #define GEO_NODE_COLLAPSE 1076
- #define GEO_NODE_UNSUBDIVIDE 1077
- #define GEO_NODE_DISSOLVE 1078
+ #define GEO_NODE_CURVE_SELECT_HANDLES 1074
+ #define GEO_NODE_MESH_EXTRUDE 1075
 -
++#define GEO_NODE_MESH_INSET 1076
++#define GEO_NODE_CURVE_SELECT_HANDLES 1077
++#define GEO_NODE_COLLAPSE 1078
++#define GEO_NODE_UNSUBDIVIDE 1079
++#define GEO_NODE_DISSOLVE 1080
  /** \} */
  
  /* -------------------------------------------------------------------- */
diff --cc source/blender/blenkernel/intern/node.cc
index 27c6a27cc3b,53c521b75ba..876a537c2af
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@@ -5157,9 -5156,8 +5157,9 @@@ static void registerGeometryNodes(
    register_node_type_geo_curve_to_points();
    register_node_type_geo_curve_trim();
    register_node_type_geo_delete_geometry();
 +  register_node_type_geo_dissolve();
    register_node_type_geo_edge_split();
-   register_node_type_geo_mesh_inset();
+   register_node_type_geo_mesh_extrude();
    register_node_type_geo_input_material();
    register_node_type_geo_is_viewport();
    register_node_type_geo_join_geometry();
diff --cc source/blender/nodes/CMakeLists.txt
index f726bc79ada,81b52ac34d2..88932e235ba
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@@ -184,9 -183,8 +184,9 @@@ set(SR
    geometry/nodes/node_geo_curve_to_points.cc
    geometry/nodes/node_geo_curve_trim.cc
    geometry/nodes/node_geo_delete_geometry.cc
 +  geometry/nodes/node_geo_dissolve.cc
    geometry/nodes/node_geo_edge_split.cc
-         geometry/nodes/node_geo_mesh_inset.cc
+     geometry/nodes/node_geo_mesh_extrude.cc
    geometry/nodes/node_geo_input_material.cc
    geometry/nodes/node_geo_is_viewport.cc
    geometry/nodes/node_geo_join_geometry.cc
diff --cc source/blender/nodes/NOD_geometry.h
index 78da83d98eb,afbd4084676..e128c8c01d1
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@@ -70,9 -69,8 +70,9 @@@ void register_node_type_geo_curve_to_me
  void register_node_type_geo_curve_to_points(void);
  void register_node_type_geo_curve_trim(void);
  void register_node_type_geo_delete_geometry(void);
 +void register_node_type_geo_dissolve(void);
  void register_node_type_geo_edge_split(void);
- void register_node_type_geo_mesh_inset(void);
+ void register_node_type_geo_mesh_extrude(void);
  void register_node_type_geo_input_material(void);
  void register_node_type_geo_is_viewport(void);
  void register_node_type_geo_join_geometry(void);
diff --cc source/blender/nodes/NOD_static_types.h
index bcf08764438,1fe2b18e2c0..3493517a226
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@@ -311,9 -310,8 +311,9 @@@ DefNode(GeometryNode, GEO_NODE_CURVE_TO
  DefNode(GeometryNode, GEO_NODE_CURVE_TO_POINTS, def_geo_curve_to_points, "CURVE_TO_POINTS", CurveToPoints, "Curve to Points", "")
  DefNode(GeometryNode, GEO_NODE_CURVE_TRIM, def_geo_curve_trim, "CURVE_TRIM", CurveTrim, "Curve Trim", "")
  DefNode(GeometryNode, GEO_NODE_DELETE_GEOMETRY, 0, "DELETE_GEOMETRY", DeleteGeometry, "Delete Geometry", "")
 +DefNode(GeometryNode, GEO_NODE_DISSOLVE, def_geo_dissolve, "DISSOLVE", Dissolve, "Dissolve", "")
  DefNode(GeometryNode, GEO_NODE_EDGE_SPLIT, 0, "EDGE_SPLIT", EdgeSplit, "Edge Split", "")
- DefNode(GeometryNode, GEO_NODE_MESH_INSET, def_geo_mesh_inset, "MESH_INSET", MeshInset, "Mesh Inset", "")
+ DefNode(GeometryNode, GEO_NODE_MESH_EXTRUDE, def_geo_mesh_extrude, "MESH_EXTRUDE", MeshExtrude, "Mesh Extrude", "")
  DefNode(GeometryNode, GEO_NODE_INPUT_MATERIAL, def_geo_input_material, "INPUT_MATERIAL", InputMaterial, "Material", "")
  DefNode(GeometryNode, GEO_NODE_IS_VIEWPORT, 0, "IS_VIEWPORT", IsViewport, "Is Viewport", "")
  DefNode(GeometryNode, GEO_NODE_JOIN_GEOMETRY, 0, "JOIN_GEOMETRY", JoinGeometry, "Join Geometry", "")