GPencil: Draw engine rewrite: Initial commit

This renames the `BKE_gpencil_*` as well as the `DNA_gpencil_types.h`
files to indicate that it's the legacy grease pencil.

@@ -0,0 +1,28 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */

@@ -0,0 +1,480 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */

@@ -0,0 +20,4 @@
+
+namespace blender::bke {
+
+namespace gpencil {

@@ -0,0 +70,4 @@
+  }
+
+ public:
+  class PreOrderRange {

@@ -0,0 +160,4 @@
+  LayerGroup &as_group();
+  Layer &as_layer();
+
+  int total_num_children() const

@@ -0,0 +197,4 @@
+  }
+
+ private:
+  void foreach_children_pre_order_recursive_(TreeNodeIterFn function)

@@ -0,0 +205,4 @@
+    }
+  }
+
+  void foreach_layer_pre_order_recursive_(LayerIterFn function)

@@ -0,0 +246,4 @@
+   * referenced drawings are discarded. If the frame is longer than the number of referenced
+   * drawings, then the last referenced drawing is held for the rest of the duration.
+   */
+  Map<int, int> frames_;

@@ -0,0 +294,4 @@
+    return frames_for_write().add_overwrite(frame_number, index);
+  }
+
+  Span<int> sorted_keys()

@@ -0,0 +307,4 @@
+    return sorted_keys_cache_.data().as_span();
+  }
+
+  void load_from_storage(GreasePencilLayer &node)

@@ -0,0 +317,4 @@
+  /**
+   * Return the index of the drawing at frame \a frame or -1 if there is no drawing.
+   */
+  int drawing_at(int frame)

@@ -0,0 +344,4 @@
+ public:
+  LayerGroup() : TreeNode(GREASE_PENCIL_LAYER_TREE_GROUP) {}
+  LayerGroup(StringRefNull name) : TreeNode(GREASE_PENCIL_LAYER_TREE_GROUP, name) {}
+  LayerGroup(const LayerGroup &other) : TreeNode(other)

@@ -0,0 +356,4 @@
+      }
+    }
+  }
+  LayerGroup(LayerGroup &&other) : TreeNode(std::move(other))

@@ -0,0 +461,4 @@
+  }
+
+ public:
+  void *batch_cache = nullptr;

@@ -200,6 +200,7 @@ typedef struct Main {
   ListBase pointclouds;
   ListBase volumes;
   ListBase simulations;
+  ListBase greasepencils;

@@ -1580,6 +1580,7 @@ GVArray CurvesGeometry::adapt_domain(const GVArray &varray,
 /** \name File reading/writing.
  * \{ */
 
+

@@ -0,0 +41,4 @@
+{
+  using namespace blender::bke;
+
+  // printf("grease_pencil_init_data\n");

@@ -0,0 +135,4 @@
+          reinterpret_cast<GreasePencilDrawingReference *>(drawing_or_ref);
+      BKE_LIB_FOREACHID_PROCESS_IDSUPER(data, drawing_reference->id_reference, IDWALK_CB_USER);
+    }
+  }

@@ -0,0 +201,4 @@
+          reinterpret_cast<GreasePencilDrawingReference *>(drawing_or_ref);
+      BLO_read_id_address(reader, grease_pencil->id.lib, &drawing_reference->id_reference);
+    }
+  }

@@ -0,0 +217,4 @@
+          reinterpret_cast<GreasePencilDrawingReference *>(drawing_or_ref);
+      BLO_expand(expander, drawing_reference->id_reference);
+    }
+  }

@@ -0,0 +293,4 @@
+    float3 min(FLT_MAX);
+    float3 max(-FLT_MAX);
+
+    for (int i = 0; i < grease_pencil->drawing_array_size; i++) {

@@ -0,0 +301,4 @@
+          const blender::bke::CurvesGeometry &curves = drawing->geometry.wrap();
+
+          if (!curves.bounds_min_max(min, max)) {
+            min = float3(-1);

@@ -0,0 +16,4 @@
+
+namespace blender::bke::gpencil::convert {
+
+void legacy_gpencil_frame_to_curves_geometry(GreasePencilDrawing &drawing, bGPDframe &gpf)

@@ -0,0 +38,4 @@
+  EXPECT_EQ(grease_pencil.drawings().size(), 0);
+  EXPECT_EQ(grease_pencil.root_group().total_num_children(), 0);
+}
+

@@ -3936,7 +3950,6 @@ void BKE_object_minmax(Object *ob, float r_min[3], float r_max[3], const bool us
       changed = true;
       break;
     }
-

@@ -315,2 +320,4 @@
       BKE_volume_batch_cache_dirty_tag((struct Volume *)ob->data, BKE_VOLUME_BATCH_DIRTY_ALL);
       break;
+    case OB_GREASE_PENCIL:
+      /* TODO: tag batches. */

@@ -2514,2 +2516,4 @@
       break;
     }
+    case ID_GP:
+      break;

@@ -0,0 +31,4 @@
+  /** Instancing Data */
+  GPUVertBuf *vbo;
+  GPUVertBuf *vbo_col;
+  /** Indices in material order, then stroke order with fill first.

@@ -0,0 +38,4 @@
+  /** Batches */
+  GPUBatch *geom_batch;
+  /** Stroke lines only */
+  GPUBatch *lines_batch;

@@ -0,0 +66,4 @@
+   * The stroke data for this drawing.
+   */
+  CurvesGeometry geometry;
+#ifdef __cplusplus

@@ -6525,1 +6525,4 @@
 
+  prop = RNA_def_property(srna, "use_grease_pencil_version3", PROP_BOOLEAN, PROP_NONE);
+  RNA_def_property_boolean_sdna(prop, NULL, "use_grease_pencil_version3", 1);
+  RNA_def_property_ui_text(prop, "Grease Pencil 3.0", "Enable the new grease pencil 3.0 codebase");

@@ -0,0 +252,4 @@
+   */
+  float tint_color[4];
+  /**
+   * Layer transfrom.

@@ -0,0 +219,4 @@
+   * Adds a layer at the end of this group and returns it.
+   */
+  Layer &add_layer(Layer &layer);
+  Layer &add_layer(Layer &&layer);

@@ -0,0 +300,4 @@
+
+class GreasePencilRuntime {
+ public:
+  mutable SharedCache<Vector<greasepencil::Layer *>> layer_cache_;

@@ -0,0 +323,4 @@
+  void ensure_layer_cache() const;
+
+  void load_layer_tree_from_storage(GreasePencilLayerTreeStorage &storage);
+  void save_layer_tree_to_storage(GreasePencilLayerTreeStorage &storage);

@@ -0,0 +328,4 @@
+  void tag_layer_tree_topology_changed();
+
+ public:
+  void *batch_cache = nullptr;

@@ -0,0 +155,4 @@
+  BLO_write_id_struct(writer, GreasePencil, id_address, &grease_pencil->id);
+  BKE_id_blend_write(writer, &grease_pencil->id);
+
+  /* Write drawings. */

@@ -0,0 +424,4 @@
+Span<int> Layer::sorted_keys() const
+{
+  this->sorted_keys_cache_.ensure([&](Vector<int> &r_data) {
+    r_data.clear_and_shrink();

@@ -0,0 +431,4 @@
+    }
+    std::sort(r_data.begin(), r_data.end());
+  });
+  return this->sorted_keys_cache_.data().as_span();

@@ -0,0 +482,4 @@
+
+void LayerGroup::add_group(LayerGroup &&group)
+{
+  this->children.append(std::make_unique<LayerGroup>(group));

@@ -0,0 +594,4 @@
+GreasePencilRuntime::GreasePencilRuntime(const GreasePencilRuntime &other)
+    : root_group_(other.root_group_), active_layer_index_(other.active_layer_index_)
+{
+  /* We cannot copy this cache, because the pointers in that cache become invalid. */

@@ -0,0 +956,4 @@
+{
+  using namespace blender;
+  const bke::GreasePencilDrawingRuntime &runtime = *this->runtime;
+  runtime.triangles_cache.ensure([&](Vector<uint3> &cache) {

@@ -0,0 +964,4 @@
+    const offset_indices::OffsetIndices<int> points_by_curve = curves.points_by_curve();
+
+    int total_triangles = 0;
+    for (int curve_i : curves.curves_range()) {

@@ -0,0 +965,4 @@
+
+    int total_triangles = 0;
+    for (int curve_i : curves.curves_range()) {
+      IndexRange points = points_by_curve[curve_i];

@@ -0,0 +984,4 @@
+      const int num_trinagles = points.size() - 2;
+
+      uint(*tris)[3] = static_cast<uint(*)[3]>(
+          BLI_memarena_alloc(pf_arena, sizeof(*tris) * size_t(num_trinagles)));

@@ -0,0 +1034,4 @@
+/** \name Grease Pencil data-block API
+ * \{ */
+
+static void grease_pencil_grow_drawing_array_by(GreasePencil &self, const int add_capacity)

@@ -0,0 +1073,4 @@
+                                                         this->drawing_array_size};
+}
+
+void GreasePencil::add_empty_drawings(int n)

@@ -0,0 +1081,4 @@
+  grease_pencil_grow_drawing_array_by(*this, n);
+  MutableSpan<GreasePencilDrawingBase *> new_drawings = this->drawings_for_write().drop_front(
+      prev_size);
+  for (const int i : IndexRange(new_drawings.size())) {

@@ -0,0 +1091,4 @@
+  }
+}
+
+void GreasePencil::remove_drawing(int index_to_remove)

@@ -0,0 +1096,4 @@
+  using namespace blender::bke::greasepencil;
+  /* In order to not change the indices of the drawings, we do the following to the drawing to be
+   * removed:
+   *  - If the drawing (A) is not the last one:

@@ -0,0 +1230,4 @@
+        GreasePencilDrawing *drawing = reinterpret_cast<GreasePencilDrawing *>(drawing_base);
+        drawing->geometry.wrap().blend_read(*reader);
+        /* Initialize runtime data. */
+        drawing->geometry.runtime = MEM_new<blender::bke::CurvesGeometryRuntime>(__func__);

@@ -0,0 +1233,4 @@
+        drawing->geometry.runtime = MEM_new<blender::bke::CurvesGeometryRuntime>(__func__);
+        drawing->geometry.wrap().update_curve_types();
+        drawing->runtime = MEM_new<blender::bke::GreasePencilDrawingRuntime>(__func__);
+        drawing->runtime->triangles_cache.tag_dirty();

@@ -0,0 +1281,4 @@
+        drawing->geometry.wrap().~CurvesGeometry();
+        MEM_delete(drawing->runtime);
+        drawing->runtime = nullptr;
+        MEM_freeN(drawing);

@@ -0,0 +195,4 @@
+  int total_points_num = 0;
+  int total_triangles_num = 0;
+  int v = 0;
+  Vector<Vector<int>> verts_start_offsets_per_visible_drawing;

@@ -0,0 +197,4 @@
+  int v = 0;
+  Vector<Vector<int>> verts_start_offsets_per_visible_drawing;
+  Vector<Vector<int>> tris_start_offsets_per_visible_drawing;
+  grease_pencil.foreach_visible_drawing(cfra, [&](GreasePencilDrawing &drawing) {

@@ -0,0 +205,4 @@
+    Vector<int> tris_start_offsets(curves.curves_num());
+
+    /* Calculate the vertex and triangle offsets for all the curves. */
+    int t = 0;

@@ -0,0 +221,4 @@
+      }
+
+      verts_start_offsets[curve_i] = v;
+      v += 1 + points.size() + (is_cyclic ? 1 : 0) + 1;

@@ -0,0 +271,4 @@
+    const offset_indices::OffsetIndices<int> points_by_curve = curves.points_by_curve();
+    const Span<float3> positions = curves.positions();
+    const VArray<bool> cyclic = curves.cyclic();
+    const VArray<float> radii = attributes.lookup_or_default<float>(

@@ -0,0 +283,4 @@
+        "material_index", ATTR_DOMAIN_CURVE, -1).varray;
+    const Span<uint3> triangles = drawing.triangles();
+    const Span<int> verts_start_offsets =
+        verts_start_offsets_per_visible_drawing[drawing_i].as_span();

@@ -688,6 +688,9 @@ static bool ED_object_editmode_load_free_ex(Main *bmain,
   else if (obedit->type == OB_CURVES) {
     /* Curves don't have specific edit mode data, so pass. */
   }
+  else if (obedit->type == OB_GREASE_PENCIL) {

@@ -0,0 +44,4 @@
+    Scene *scene = CTX_data_scene(&C);
+    ARegion *region = CTX_wm_region(&C);
+    Object *obact = CTX_data_active_object(&C);
+    Object *ob_eval = DEG_get_evaluated_object(depsgraph, obact);

@@ -0,0 +109,4 @@
+  curves.offsets_for_write()[num_old_curves] = num_old_points;
+  curves.offsets_for_write()[num_old_curves + 1] = num_old_points + stroke_points.size();
+
+  const offset_indices::OffsetIndices<int> points_by_curve = curves.points_by_curve();

@@ -0,0 +82,4 @@
+  /**
+   * Number of users of this drawing in the layer tree.
+   */
+  int32_t user_count;

@@ -0,0 +109,4 @@
+  /**
+   * A buffer for a single stroke while drawing.
+   */
+  blender::Span<blender::bke::StrokePoint> stroke_buffer();

@@ -0,0 +110,4 @@
+   * A buffer for a single stroke while drawing.
+   */
+  blender::Span<blender::bke::StrokePoint> stroke_buffer();
+  bool has_stroke_buffer();

@@ -0,0 +180,4 @@
+  struct GreasePencilLayerMask *next, *prev;
+  /**
+   * The name of the layer that is the mask.
+   * \note Null-terminated.

@@ -0,0 +247,4 @@
+  /**
+   * List of `GreasePencilLayerMask`. Only used for storage in the .blend file.
+   */
+  ListBase masks_storage;

@@ -0,0 +406,4 @@
+  struct AnimData *adt;
+
+  /**
+   * An array of pointers to drawings. The drawing can own it's data or reference it from another

@@ -0,0 +414,4 @@
+  int drawing_array_size;
+  char _pad[4];
+#ifdef __cplusplus
+  void read_drawing_array(BlendDataReader *reader);

@@ -0,0 +446,4 @@
+   */
+  GreasePencilRuntimeHandle *runtime;
+#ifdef __cplusplus
+  blender::Span<GreasePencilDrawingBase *> drawings() const;

@@ -0,0 +449,4 @@
+  blender::Span<GreasePencilDrawingBase *> drawings() const;
+  blender::MutableSpan<GreasePencilDrawingBase *> drawings_for_write();
+  void add_empty_drawings(int n);
+  void remove_drawing(int index);

@@ -0,0 +117,4 @@
+   *
+   *           | | | | | | | | | | |1|1|1|1|1|1|1|
+   *    Time:  |0|1|2|3|4|5|6|7|8|9|0|1|2|3|4|5|6|...
+   *    Frame: [#0      ][#1      ]    [#2    ]

@@ -0,0 +151,4 @@
+    }
+  }
+
+  radii.finish();

@@ -0,0 +16,4 @@
+/* --------------------------------------------------------------------------------------------- */
+/* Grease Pencil ID Tests. */
+
+struct GreasePencilIDTestContext {

@@ -0,0 +1,154 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later
+ * Copyright 2022 Blender Foundation. */

@@ -0,0 +77,4 @@
+    const float *sizeinv = DRW_viewport_invert_size_get();
+    const float4 metrics = {sizeinv[0], sizeinv[1], size[0], size[1]};
+
+    if (anti_aliasing_enabled_) {

@@ -0,0 +136,4 @@
+      manager.submit(edge_detect_ps_);
+    }
+
+    if (anti_aliasing_enabled_) {

@@ -0,0 +1,325 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later
+ * Copyright 2022 Blender Foundation. */

@@ -0,0 +19,4 @@
+#include "draw_manager.hh"
+#include "draw_pass.hh"
+
+#define GP_LIGHT

@@ -0,0 +1,65 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later
+ * Copyright 2022 Blender Foundation. */

@@ -0,0 +8,4 @@
+#pragma once
+
+#include "BKE_grease_pencil.hh"
+#include "BKE_image.h"

@@ -0,0 +32,4 @@
+
+  void sync(const Object *object, const bke::greasepencil::Layer &layer, bool &do_layer_blending)
+  {
+    UNUSED_VARS(object, layer);

@@ -0,0 +164,4 @@
+    ob.material_offset = material_offset;
+
+    if (do_layer_blending) {
+      // for (const LayerData &layer : frame.layers) {

@@ -0,0 +186,4 @@
+    }
+    // });
+
+#if 0

@@ -0,0 +248,4 @@
+  }
+
+ private:
+  // static float4 frame_tint_get(const bGPdata *gpd, const bGPDframe *gpf, int /* current_frame

@@ -0,0 +41,4 @@
+    const char *name = static_shader_create_info_name_get(eShaderType(i));
+    if (name == nullptr) {
+      std::cerr << "GPencil: Missing case for eShaderType(" << i
+                << ") in static_shader_create_info_name_get().";

@@ -0,0 +105,4 @@
+    shaders_[shader_type] = GPU_shader_create_from_info_name(shader_name);
+
+    if (shaders_[shader_type] == nullptr) {
+      fprintf(stderr, "GPencil: error: Could not compile static shader \"%s\"\n", shader_name);

@@ -256,3 +256,3 @@
-/* GPencil */
+/* GPencil (legacy) */
 
 struct GPUBatch *DRW_cache_gpencil_get(struct Object *ob, int cfra);

@@ -0,0 +303,4 @@
+      s_vert.stroke_id = verts_range.first();
+      s_vert.mat = materials[curve_i] % GPENCIL_MATERIAL_BUFFER_LEN;
+
+      /* TODO */

@@ -0,0 +47,4 @@
+      operation = greasepencil::new_paint_operation().release();
+      break;
+    default:
+      BLI_assert_unreachable();

@@ -0,0 +122,4 @@
+    return OPERATOR_CANCELLED;
+  }
+
+  op->customdata = static_cast<void *>(paint_stroke_new(C,

@@ -0,0 +131,4 @@
+                                                        stroke_done,
+                                                        event->type));
+
+  int return_value = op->type->modal(C, op, event);

@@ -0,0 +191,4 @@
+
+  ob->mode = OB_MODE_PAINT_GPENCIL;
+
+  /* Setup cursor color. BKE_paint_init() could be used, but creates an additional brush. */

@@ -0,0 +47,4 @@
+  /**
+   * \returns true if this node is a LayerGroup.
+   */
+  constexpr bool is_group() const

@@ -0,0 +82,4 @@
+   * \returns this tree node as a mutable Layer.
+   * \note This results in undefined behavior if the node is not a Layer.
+   */
+  Layer &as_layer_for_write();

@@ -0,0 +293,4 @@
+ * Stroke cache for a stroke that is currently being drawn.
+ */
+struct StrokeCache {
+  Vector<StrokePoint> points = {};

@@ -0,0 +54,4 @@
+{
+  using namespace blender;
+
+  GreasePencil *grease_pencil_dst = (GreasePencil *)id_dst;

@@ -0,0 +418,4 @@
+
+bool Layer::overwrite_frame(int frame_number, GreasePencilFrame &&frame)
+{
+  return this->frames_for_write().add_overwrite(frame_number, frame);

@@ -0,0 +687,4 @@
+  return grease_pencil;
+}
+
+BoundBox *BKE_grease_pencil_boundbox_get(Object *ob)

@@ -0,0 +787,4 @@
+
+    const bke::CurvesGeometry &curves = this->geometry.wrap();
+    const Span<float3> positions = curves.positions();
+    const offset_indices::OffsetIndices<int> points_by_curve = curves.points_by_curve();

@@ -0,0 +1141,4 @@
+  Vector<LayerMask> masks = new_layer.masks_for_write();
+  GreasePencilLayerMaskStorage *masks_storage = &node_leaf->layer.masks_storage;
+  for (int mask_i = 0; mask_i < masks_storage->masks_size; mask_i++) {
+    GreasePencilLayerMask *mask = &masks_storage->masks[mask_i];

@@ -0,0 +19,4 @@
+
+namespace blender::bke::greasepencil::convert {
+
+void legacy_gpencil_frame_to_grease_pencil_drawing(GreasePencilDrawing &drawing, bGPDframe &gpf)

@@ -0,0 +36,4 @@
+  explicit TreeNode(GreasePencilLayerTreeNodeType type);
+  explicit TreeNode(GreasePencilLayerTreeNodeType type, StringRefNull name);
+  TreeNode(const TreeNode &other);
+  TreeNode &operator=(const TreeNode &other) = delete;

@@ -0,0 +47,4 @@
+  /**
+   * \returns true if this node is a LayerGroup.
+   */
+  const bool is_group() const

@@ -0,0 +153,4 @@
+  /**
+   * \returns the layer masks.
+   */
+  const Vector<LayerMask> &masks() const;

@@ -0,0 +163,4 @@
+  /**
+   * \return true if the layer is locked.
+   */
+  bool is_locked() const;

@@ -0,0 +53,4 @@
+                                    const int /*flag*/)
+{
+  using namespace blender;
+

@@ -0,0 +169,4 @@
+static void grease_pencil_blend_read_data(BlendDataReader *reader, ID *id)
+{
+  using namespace blender::bke::greasepencil;
+  GreasePencil *grease_pencil = (GreasePencil *)id;

@@ -0,0 +190,4 @@
+
+static void grease_pencil_blend_read_lib(BlendLibReader *reader, ID *id)
+{
+  GreasePencil *grease_pencil = (GreasePencil *)id;

@@ -0,0 +411,4 @@
+  return this->frames_for_write().add(frame_number, frame);
+}
+
+bool Layer::overwrite_frame(int frame_number, GreasePencilFrame &frame)

@@ -0,0 +434,4 @@
+  return this->sorted_keys_cache_.data();
+}
+
+int Layer::drawing_index_at(int frame) const

@@ -0,0 +1196,4 @@
+}
+
+static void save_tree_node_to_storage(const blender::bke::greasepencil::TreeNode &node,
+                                      GreasePencilLayerTreeNode *dst)

@@ -0,0 +1334,4 @@
+
+void GreasePencil::read_layer_tree_storage(BlendDataReader *reader)
+{
+  BLO_read_pointer_array(reader, (void **)&this->layer_tree_storage.nodes);

@@ -0,0 +1415,4 @@
+  }
+  for (int i = 0; i < this->layer_tree_storage.nodes_num; i++) {
+    GreasePencilLayerTreeNode *node = this->layer_tree_storage.nodes[i];
+    if (node->name) {

@@ -0,0 +19,4 @@
+
+#include "BLI_smaa_textures.h"
+
+namespace blender::greasepencil {

@@ -0,0 +200,4 @@
+
+using namespace blender;
+
+struct GPENCIL_NEXT_Data {

@@ -0,0 +296,4 @@
+                                    struct RenderLayer *layer,
+                                    const struct rcti * /*rect*/)
+{
+  UNUSED_VARS(vedata, engine, layer);

@@ -1983,3 +1990,3 @@
             ),
         )
-
+    

@@ -0,0 +114,4 @@
+   *    {0: 0, 5: 1, 10: -1, 12: 2, 16: -1}
+   *
+   *    In this example there are three drawings (drawing #0, drawing #1 and drawing #2). The first
+   *    drawing starts at frame 0 and ends at frame 5 (excusive). The second drawing starts at

@@ -0,0 +207,4 @@
+   */
+  mutable CacheMutex children_cache_mutex_;
+  /**
+   * Caches all the children of this group in a single pre-order vector.

@@ -0,0 +273,4 @@
+
+}  // namespace convert
+
+}  // namespace greasepencil

@@ -0,0 +144,4 @@
+
+  /* Free storage if there is one. */
+  grease_pencil->free_layer_tree_storage();
+  grease_pencil->save_layer_tree_to_storage();

@@ -0,0 +684,4 @@
+{
+  GreasePencil *grease_pencil = reinterpret_cast<GreasePencil *>(
+      BKE_id_new_nomain(ID_GP, nullptr));
+  grease_pencil_init_data(&grease_pencil->id);

@@ -480,6 +480,8 @@ uint64_t BKE_library_id_can_use_filter_id(const ID *id_owner)
     case ID_IP:
       /* Deprecated... */
       return 0;
+    case ID_GP:

@@ -654,6 +654,8 @@ ListBase *which_libbase(Main *bmain, short type)
       return &(bmain->volumes);
     case ID_SIM:
       return &(bmain->simulations);
+    case ID_GP:

@@ -719,6 +721,7 @@ int set_listbasepointers(Main *bmain, ListBase *lb[/*INDEX_ID_MAX*/])
   lb[INDEX_ID_WM] = &(bmain->wm);
   lb[INDEX_ID_MSK] = &(bmain->masks);
   lb[INDEX_ID_SIM] = &(bmain->simulations);
+  lb[INDEX_ID_GP] = &(bmain->grease_pencils);

@@ -1110,3 +1110,3 @@
         return N_("Browse Particle Settings to be linked");
       case ID_GD_LEGACY:
-        return N_("Browse Grease Pencil Data to be linked");
+        return N_("Browse Grease Pencil (legacy) Data to be linked");

@@ -41,3 +41,3 @@
     {ID_CV, "CURVES", ICON_CURVES_DATA, "Curves", ""},
     {ID_VF, "FONT", ICON_FONT_DATA, "Font", ""},
-    {ID_GD_LEGACY, "GREASEPENCIL", ICON_GREASEPENCIL, "Grease Pencil", ""},
+    {ID_GD_LEGACY, "GREASEPENCIL", ICON_GREASEPENCIL, "Grease Pencil (legacy)", ""},

@@ -255,3 +255,3 @@
     {OB_POINTCLOUD, "POINTCLOUD", ICON_OUTLINER_OB_POINTCLOUD, "Point Cloud", ""},
     {OB_VOLUME, "VOLUME", ICON_OUTLINER_OB_VOLUME, "Volume", ""},
-    {OB_GPENCIL_LEGACY, "GPENCIL", ICON_OUTLINER_OB_GREASEPENCIL, "Grease Pencil", ""},
+    {OB_GPENCIL_LEGACY, "GPENCIL", ICON_OUTLINER_OB_GREASEPENCIL, "Grease Pencil (legacy)", ""},

@@ -0,0 +190,4 @@
+  /**
+   * \returns the layer masks.
+   */
+  // Span<LayerMask> masks() const;

@@ -0,0 +320,4 @@
+  void *batch_cache = nullptr;
+
+ public:
+  // bool has_active_layer() const;

@@ -0,0 +122,4 @@
+  BKE_grease_pencil_batch_cache_free(grease_pencil);
+
+  MEM_delete(grease_pencil->runtime);
+  grease_pencil->runtime = nullptr;

@@ -0,0 +147,4 @@
+
+  /* Write animation data. */
+  if (grease_pencil->adt) {
+    BKE_animdata_blend_write(writer, grease_pencil->adt);

@@ -0,0 +172,4 @@
+  /* Read animation data. */
+  BLO_read_data_address(reader, &grease_pencil->adt);
+  BKE_animdata_blend_read_data(reader, grease_pencil->adt);
+

@@ -0,0 +1188,4 @@
+  BLO_write_struct(writer, GreasePencilLayer, node);
+  BLO_write_string(writer, node->base.name);
+
+  MEM_SAFE_FREE(node->frames_storage.keys);

@@ -0,0 +111,4 @@
+
+  /* Duplicate runtime data. */
+  if (grease_pencil_src->runtime) {
+    grease_pencil_dst->runtime = MEM_new<bke::GreasePencilRuntime>(__func__,

@@ -0,0 +128,4 @@
+
+  BKE_grease_pencil_batch_cache_free(grease_pencil);
+
+  MEM_delete(grease_pencil->runtime);

@@ -4523,6 +4523,9 @@ static RNAProcessItem PROCESS_ITEMS[] = {
     {"rna_dynamicpaint.c", NULL, RNA_def_dynamic_paint},
     {"rna_fcurve.c", "rna_fcurve_api.c", RNA_def_fcurve},
     {"rna_gpencil_legacy.c", NULL, RNA_def_gpencil},
+#ifdef WITH_GREASE_PENCIL_V3

@@ -40,7 +40,11 @@ const EnumPropertyItem rna_enum_id_type_items[] = {
     {ID_CU_LEGACY, "CURVE", ICON_CURVE_DATA, "Curve", ""},
     {ID_CV, "CURVES", ICON_CURVES_DATA, "Curves", ""},
     {ID_VF, "FONT", ICON_FONT_DATA, "Font", ""},
+#ifdef WITH_GREASE_PENCIL_V3

@@ -485,2 +489,4 @@
     case ID_GD_LEGACY:
       return &RNA_GreasePencil;
+    case ID_GP:
+#  ifdef WITH_GREASE_PENCIL_V3