Commit: cf06323673eefcf665e75e970efd12f9f7f77299 Author: Hans Goudey Date: Wed Dec 29 16:59:42 2021 -0600 Branches: temp-geometry-nodes-extrude-mesh https://developer.blender.org/rBcf06323673eefcf665e75e970efd12f9f7f77299
Merge branch 'master' into temp-geometry-nodes-extrude-mesh =================================================================== =================================================================== diff --cc source/blender/blenkernel/BKE_node.h index 7cc0a714c6a,8bc4292448d..3e191a78ac7 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@@ -1715,7 -1706,7 +1706,8 @@@ int ntreeTexExecTree(struct bNodeTree * #define GEO_NODE_INPUT_MESH_EDGE_NEIGHBORS 1143 #define GEO_NODE_INPUT_MESH_ISLAND 1144 #define GEO_NODE_INPUT_SCENE_TIME 1145 - #define GEO_NODE_EXTRUDE_MESH 1146 + #define GEO_NODE_ACCUMULATE_FIELD 1146 ++#define GEO_NODE_EXTRUDE_MESH 1147 /** \} */ diff --cc source/blender/nodes/NOD_static_types.h index c23fa6afb62,108a37d0176..91d8385b852 --- a/source/blender/nodes/NOD_static_types.h +++ b/source/blender/nodes/NOD_static_types.h @@@ -347,8 -347,8 +347,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_DELETE_GEOMETRY, def_geo_delete_geometry, "DELETE_GEOMETRY", DeleteGeometry, "Delete Geometry", "") 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_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", "") _______________________________________________ Bf-blender-cvs mailing list [email protected] List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
