diff --git a/source/blender/nodes/geometry/nodes/node_geo_set_spline_resolution.cc b/source/blender/nodes/geometry/nodes/node_geo_set_spline_resolution.cc index d531e057827..81c22382b43 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_set_spline_resolution.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_set_spline_resolution.cc @@ -3,6 +3,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ #include "BKE_curves.hh" +#include "BKE_grease_pencil.hh" #include "node_geometry_util.hh" @@ -10,15 +11,17 @@ namespace blender::nodes::node_geo_set_spline_resolution_cc { static void node_declare(NodeDeclarationBuilder &b) { - b.add_input("Geometry").supported_type(GeometryComponent::Type::Curve); + b.add_input("Geometry") + .supported_type({GeometryComponent::Type::Curve, GeometryComponent::Type::GreasePencil}); b.add_input("Selection").default_value(true).hide_value().field_on_all(); b.add_input("Resolution").min(1).default_value(12).field_on_all(); b.add_output("Geometry").propagate_all(); } -static void set_resolution(bke::CurvesGeometry &curves, - const Field &selection_field, - const Field &resolution_field) +static void set_curve_resolution(bke::CurvesGeometry &curves, + const fn::FieldContext &field_context, + const Field &selection_field, + const Field &resolution_field) { if (curves.curves_num() == 0) { return; @@ -28,7 +31,6 @@ static void set_resolution(bke::CurvesGeometry &curves, ATTR_DOMAIN_CURVE); bke::AttributeValidator validator = attributes.lookup_validator("resolution"); - const bke::CurvesFieldContext field_context{curves, ATTR_DOMAIN_CURVE}; fn::FieldEvaluator evaluator{field_context, curves.curves_num()}; evaluator.set_selection(selection_field); evaluator.add_with_destination(validator.validate_field_if_necessary(resolution_field), @@ -38,6 +40,23 @@ static void set_resolution(bke::CurvesGeometry &curves, resolutions.finish(); } +static void set_grease_pencil_resolution(GreasePencil &grease_pencil, + const Field &selection_field, + const Field &resolution_field) +{ + using namespace blender::bke::greasepencil; + for (const int layer_index : grease_pencil.layers().index_range()) { + Drawing *drawing = get_eval_grease_pencil_layer_drawing_for_write(grease_pencil, layer_index); + if (drawing == nullptr) { + continue; + } + bke::CurvesGeometry &curves = drawing->strokes_for_write(); + const bke::GreasePencilLayerFieldContext field_context( + grease_pencil, ATTR_DOMAIN_CURVE, layer_index); + set_curve_resolution(curves, field_context, selection_field, resolution_field); + } +} + static void node_geo_exec(GeoNodeExecParams params) { GeometrySet geometry_set = params.extract_input("Geometry"); @@ -46,7 +65,13 @@ static void node_geo_exec(GeoNodeExecParams params) geometry_set.modify_geometry_sets([&](GeometrySet &geometry_set) { if (Curves *curves_id = geometry_set.get_curves_for_write()) { - set_resolution(curves_id->geometry.wrap(), selection, resolution); + bke::CurvesGeometry &curves = curves_id->geometry.wrap(); + const bke::CurvesFieldContext field_context{curves, ATTR_DOMAIN_CURVE}; + set_curve_resolution(curves_id->geometry.wrap(), field_context, selection, resolution); + } + if (geometry_set.has_grease_pencil()) { + set_grease_pencil_resolution( + *geometry_set.get_grease_pencil_for_write(), selection, resolution); } });