Commit: 60dccd4e6f87d7603266c2023740ed740d727df9
Author: Howard Trickey
Date: Sat Dec 10 13:38:57 2022 -0500
Branches: bevelv2
https://developer.blender.org/rB60dccd4e6f87d7603266c2023740ed740d727df9
Merge branch 'master' into bevelv2
===================================================================
===================================================================
diff --cc source/blender/nodes/NOD_static_types.h
index 7cd3101ad14,d94b0b56072..94bd2034ad7
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@@ -283,10 -283,10 +283,11 @@@ DefNode(FunctionNode, FN_NODE_VALUE_TO_
DefNode(GeometryNode, GEO_NODE_ACCUMULATE_FIELD, def_geo_accumulate_field,
"ACCUMULATE_FIELD", AccumulateField, "Accumulate Field", "Add the values of an
evaluated field together and output the running total for each element")
DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_DOMAIN_SIZE,
def_geo_attribute_domain_size, "ATTRIBUTE_DOMAIN_SIZE", AttributeDomainSize,
"Domain Size", "Retrieve the number of elements in a geometry for each
attribute domain")
DefNode(GeometryNode, GEO_NODE_ATTRIBUTE_STATISTIC,
def_geo_attribute_statistic, "ATTRIBUTE_STATISTIC",AttributeStatistic,
"Attribute Statistic","Calculate statistics about a data set from a field
evaluated on a geometry")
+DefNode(GeometryNode, GEO_NODE_BEVEL_MESH, def_geo_bevel_mesh, "BEVEL_MESH",
BevelMesh, "Bevel Mesh", "")
+ DefNode(GeometryNode, GEO_NODE_BLUR_ATTRIBUTE, def_geo_blur_attribute,
"BLUR_ATTRIBUTE", BlurAttribute, "Blur Attribute", "Mix attribute values of
neighboring elements")
DefNode(GeometryNode, GEO_NODE_BOUNDING_BOX, 0, "BOUNDING_BOX", BoundBox,
"Bounding Box", "Calculate the limits of a geometry's positions and generate a
box mesh with those dimensions")
DefNode(GeometryNode, GEO_NODE_CAPTURE_ATTRIBUTE,
def_geo_attribute_capture,"CAPTURE_ATTRIBUTE", CaptureAttribute, "Capture
Attribute", "Store the result of a field on a geometry and output the data as a
node socket. Allows remembering or interpolating data as the geometry changes,
such as positions before deformation")
- DefNode(GeometryNode, GEO_NODE_COLLECTION_INFO, def_geo_collection_info,
"COLLECTION_INFO", CollectionInfo, "Collection Info", "Retrieve geometry from a
collection")
+ DefNode(GeometryNode, GEO_NODE_COLLECTION_INFO, def_geo_collection_info,
"COLLECTION_INFO", CollectionInfo, "Collection Info", "Retrieve geometry
instances from a collection")
DefNode(GeometryNode, GEO_NODE_CONVEX_HULL, 0, "CONVEX_HULL", ConvexHull,
"Convex Hull", "Create a mesh that encloses all points in the input geometry
with the smallest number of points")
DefNode(GeometryNode, GEO_NODE_CURVE_ENDPOINT_SELECTION, 0,
"CURVE_ENDPOINT_SELECTION", CurveEndpointSelection, "Endpoint Selection",
"Provide a selection for an arbitrary number of endpoints in each spline")
DefNode(GeometryNode, GEO_NODE_CURVE_HANDLE_TYPE_SELECTION,
def_geo_curve_handle_type_selection, "CURVE_HANDLE_TYPE_SELECTION",
CurveHandleTypeSelection, "Handle Type Selection", "Provide a selection based
on the handle types of Bézier control points")
diff --cc source/blender/nodes/geometry/CMakeLists.txt
index 7852d0a94b3,c6151022ac5..aa2b3a32c97
--- a/source/blender/nodes/geometry/CMakeLists.txt
+++ b/source/blender/nodes/geometry/CMakeLists.txt
@@@ -29,7 -29,7 +29,8 @@@ set(SR
nodes/node_geo_attribute_capture.cc
nodes/node_geo_attribute_domain_size.cc
nodes/node_geo_attribute_statistic.cc
+ nodes/node_geo_bevel_mesh.cc
+ nodes/node_geo_blur_attribute.cc
nodes/node_geo_boolean.cc
nodes/node_geo_bounding_box.cc
nodes/node_geo_collection_info.cc
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
