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

[Hans Goudey]

Commit: 0c0ba3a2ee97d6dccc6609d0b7a759082722bac3
Author: Hans Goudey
Date:   Tue Jan 18 15:04:23 2022 -0600
Branches: temp-geometry-nodes-extrude-mesh
https://developer.blender.org/rB0c0ba3a2ee97d6dccc6609d0b7a759082722bac3

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

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



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

diff --cc source/blender/blenkernel/BKE_node.h
index 43a2960ecee,8f408ecd675..287657e9a71
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1628,7 -1628,7 +1628,8 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_INPUT_SCENE_TIME 1145
  #define GEO_NODE_ACCUMULATE_FIELD 1146
  #define GEO_NODE_INPUT_MESH_EDGE_ANGLE 1147
- #define GEO_NODE_EXTRUDE_MESH 1148
+ #define GEO_NODE_FIELD_AT_INDEX 1148
++#define GEO_NODE_EXTRUDE_MESH 1149
  
  /** \} */
  
diff --cc source/blender/blenkernel/intern/node.cc
index a532f4ed31c,b3bf80cd448..9ca1a5b11e6
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@@ -4767,7 -4767,7 +4767,8 @@@ 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_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 db10f964894,3b9dd5a1f7c..c2d69204521
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@@ -98,7 -98,7 +98,8 @@@ 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_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/NOD_static_types.h
index 4138f4ecf98,7434e0071ee..34c7e3bbfe5
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@@ -351,7 -351,7 +351,8 @@@ DefNode(GeometryNode, GEO_NODE_DELETE_G
  DefNode(GeometryNode, GEO_NODE_DISTRIBUTE_POINTS_ON_FACES, def_geo_distribute_points_on_faces, "DISTRIBUTE_POINTS_ON_FACES", DistributePointsOnFaces, "Distribute Points on Faces", "")
  DefNode(GeometryNode, GEO_NODE_ACCUMULATE_FIELD, def_geo_accumulate_field, "ACCUMULATE_FIELD", AccumulateField, "Accumulate Field", "")
  DefNode(GeometryNode, GEO_NODE_DUAL_MESH, 0, "DUAL_MESH", DualMesh, "Dual Mesh", "")
 +DefNode(GeometryNode, GEO_NODE_EXTRUDE_MESH, def_geo_extrude_mesh, "EXTRUDE_MESH", ExtrudeMesh, "Extrude Mesh", "")
+ DefNode(GeometryNode, GEO_NODE_FIELD_AT_INDEX, def_geo_field_at_index, "FIELD_AT_INDEX", FieldAtIndex, "Field at Index", "")
  DefNode(GeometryNode, GEO_NODE_FILL_CURVE, def_geo_curve_fill, "FILL_CURVE", FillCurve, "Fill Curve", "")
  DefNode(GeometryNode, GEO_NODE_FILLET_CURVE, def_geo_curve_fillet, "FILLET_CURVE", FilletCurve, "Fillet Curve", "")
  DefNode(GeometryNode, GEO_NODE_GEOMETRY_TO_INSTANCE, 0, "GEOMETRY_TO_INSTANCE", GeometryToInstance, "Geometry to Instance", "")
diff --cc source/blender/nodes/geometry/CMakeLists.txt
index 726b2c46284,b9e762a341a..42e685c11eb
--- a/source/blender/nodes/geometry/CMakeLists.txt
+++ b/source/blender/nodes/geometry/CMakeLists.txt
@@@ -116,7 -116,7 +116,8 @@@ 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_geometry_to_instance.cc
    nodes/node_geo_image_texture.cc
    nodes/node_geo_input_curve_handles.cc