Merge branch 'main' into gpv3-geometry-nodes

@@ -152,0 +167,4 @@
+                        propagation_info,
+                        dst_curves))
+    {
+      return;

@@ -565,0 +686,4 @@
+    if (grease_pencil == nullptr) {
+      return false;
+    }
+    std::atomic<bool> any_success = false;

@@ -1995,1 +2211,4 @@
   }
+  if (node.is_layer()) {
+    const Span<const bke::greasepencil::Layer *> layers = this->layers();
+

@@ -99,12 +132,24 @@ class GeometryFieldContext : public fn::FieldContext {
   const void *geometry_;
   const GeometryComponent::Type type_;
   const eAttrDomain domain_;
+  /** Only used when the type is grease pencil and the domain is either points or curves

@@ -123,1 +168,4 @@
 
+  int grease_pencil_layer_index() const
+  {
+    return grease_pencil_layer_index_;

@@ -686,3 +686,2 @@
  * A geometry component that stores #GreasePencil data.
- * This component does not implement an attribute API, because the #GreasePencil data itself does
- * not store any attributes, only the individual drawings within it.
+ * The attributes on this component are only on the layer domain.

@@ -98,0 +151,4 @@
+    }
+  };
+  fn.domain_supported = [](const void * /*owner*/, const eAttrDomain domain) {
+    return ELEM(domain, ATTR_DOMAIN_GREASE_PENCIL_LAYER);

@@ -485,2 +603,2 @@
-                                   const fn::Field<bool> &selection,
-                                   const fn::GField &field)
+static bool try_capture_field_on_geometry(MutableAttributeAccessor attributes,
+                                          GeometryFieldContext field_context,

@@ -565,0 +697,4 @@
+      return false;
+    }
+    std::atomic<bool> any_success = false;
+    threading::parallel_for(

@@ -1956,0 +2047,4 @@
+    }
+  }
+  else {
+    for (const int i : IndexRange(reorder_to, dist)) {

@@ -571,6 +571,13 @@ void *BLI_findlinkfrom(Link *start, int number)
       link = link->next;
     }
   }
+  else {

@@ -119,3 +118,1 @@
-                                    Field<float> &start_field,
-                                    Field<float> &end_field,
-                                    const AnonymousAttributePropagationInfo &propagation_info)
+static bool set_curve_trim(const bke::CurvesGeometry &src_curves,

@@ -130,3 +127,4 @@
+    return false;
   }
 
   const bke::CurvesFieldContext field_context{src_curves, ATTR_DOMAIN_CURVE};

@@ -149,3 +145,1 @@
-  Curves *dst_curves_id = bke::curves_new_nomain(std::move(dst_curves));
-  bke::curves_copy_parameters(src_curves_id, *dst_curves_id);
-  geometry_set.replace_curves(dst_curves_id);
+  dst_curves = std::move(

@@ -39,3 +39,2 @@
 
-  const bke::GeometryFieldContext value_context{
-      context.geometry(), context.type(), value_field_domain_};
+  const bke::GeometryFieldContext value_context{context.geometry(),

@@ -114,0 +121,4 @@
+            (dst_domain == ATTR_DOMAIN_GREASE_PENCIL_LAYER))
+    {
+      /* Evaluate field just for the current layer. */
+      if (src_domain_ == ATTR_DOMAIN_GREASE_PENCIL_LAYER) {

@@ -114,0 +126,4 @@
+                                                           ATTR_DOMAIN_GREASE_PENCIL_LAYER};
+        const int layer_index = context.grease_pencil_layer_index();
+
+        const IndexMask single_layer_mask = IndexRange(layer_index, 1);

@@ -352,4 +404,9 @@ bool try_capture_field_on_geometry(GeometryComponent &component,
 std::optional<eAttrDomain> try_detect_field_domain(const GeometryComponent &component,
                                                    const fn::GField &field);
 
+const greasepencil::Drawing *get_eval_grease_pencil_layer_drawing(

@@ -138,0 +209,4 @@
+}
+const greasepencil::Drawing *GeometryFieldContext::grease_pencil_layer_drawing() const
+{
+  return this->type() == GeometryComponent::Type::GreasePencil &&

@@ -37,0 +54,4 @@
+      return field_input.get_varray_for_context(context, mask, scope);
+    }
+  }
+  return {};

@@ -1967,1 +2117,4 @@
+    }
   }
+  if (node.is_group()) {
+    BLI_assert_msg(0, "Reordering custom data when moving a group is not implemented");

@@ -1947,0 +2000,4 @@
+  const IndexRange range_before(insertion_index + 1);
+  const IndexRange range_after(insertion_index + 1, size - insertion_index - 1);
+
+  if (range_before.size() > 0) {