[Bf-blender-cvs] [5ad0321cfa6] temp-geometry-nodes-extrude-mesh: Merge branch 'master' into temp-geometry-nodes-extrude-mesh

[Hans Goudey]

Commit: 5ad0321cfa644febbd7c2a19dbeaec62d630d59c
Author: Hans Goudey
Date:   Fri Jan 21 09:38:52 2022 -0600
Branches: temp-geometry-nodes-extrude-mesh
https://developer.blender.org/rB5ad0321cfa644febbd7c2a19dbeaec62d630d59c

Merge branch 'master' into temp-geometry-nodes-extrude-mesh

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



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

diff --cc release/scripts/startup/nodeitems_builtins.py
index f0d91ce5de8,772668cb3fb..4ec1cb4af5b
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@@ -142,7 -142,7 +142,8 @@@ def mesh_node_items(context)
          yield NodeItemCustom(draw=lambda self, layout, context: layout.separator())
  
      yield NodeItem("GeometryNodeDualMesh")
 +    yield NodeItem("GeometryNodeExtrudeMesh")
+     yield NodeItem("GeometryNodeFlipFaces")
      yield NodeItem("GeometryNodeMeshBoolean")
      yield NodeItem("GeometryNodeMeshToCurve")
      yield NodeItem("GeometryNodeMeshToPoints")
diff --cc source/blender/blenkernel/BKE_node.h
index bf958b0868a,ccea76fc24d..bb7d647e713
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1630,7 -1630,7 +1630,8 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_INPUT_MESH_EDGE_ANGLE 1147
  #define GEO_NODE_FIELD_AT_INDEX 1148
  #define GEO_NODE_CURVE_PRIMITIVE_ARC 1149
- #define GEO_NODE_EXTRUDE_MESH 1150
+ #define GEO_NODE_FLIP_FACES 1150
++#define GEO_NODE_EXTRUDE_MESH 1151
  
  /** \} */
  
diff --cc source/blender/blenkernel/intern/node.cc
index 6271561ae23,9ee54c9ebeb..56841368893
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@@ -4768,8 -4768,8 +4768,9 @@@ static void registerGeometryNodes(
    register_node_type_geo_distribute_points_on_faces();
    register_node_type_geo_dual_mesh();
    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();
diff --cc source/blender/nodes/NOD_geometry.h
index 8f6ab1eeb13,ff4036308c6..0d0e9462891
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@@ -99,8 -99,8 +99,9 @@@ void register_node_type_geo_delete_geom
  void register_node_type_geo_distribute_points_on_faces(void);
  void register_node_type_geo_dual_mesh(void);
  void register_node_type_geo_edge_split(void);
 +void register_node_type_geo_extrude_mesh(void);
  void register_node_type_geo_field_at_index(void);
+ void register_node_type_geo_flip_faces(void);
  void register_node_type_geo_geometry_to_instance(void);
  void register_node_type_geo_image_texture(void);
  void register_node_type_geo_input_curve_handles(void);
diff --cc source/blender/nodes/geometry/CMakeLists.txt
index 6112f358fe9,37d7843020a..ab1fefb5ad9
--- a/source/blender/nodes/geometry/CMakeLists.txt
+++ b/source/blender/nodes/geometry/CMakeLists.txt
@@@ -117,8 -117,8 +117,9 @@@ set(SR
    nodes/node_geo_distribute_points_on_faces.cc
    nodes/node_geo_dual_mesh.cc
    nodes/node_geo_edge_split.cc
 +  nodes/node_geo_extrude_mesh.cc
    nodes/node_geo_field_at_index.cc
+   nodes/node_geo_flip_faces.cc
    nodes/node_geo_geometry_to_instance.cc
    nodes/node_geo_image_texture.cc
    nodes/node_geo_input_curve_handles.cc