# Conflicts:
#	source/blender/draw/engines/overlay/overlay_next_instance.cc

@@ -748,1 +712,3 @@
-    DRW_buffer_add_entry(ctx->envelope_distance, head_sph, tail_sph, xaxis);
+    if (ctx->bone_buf) {
+      ctx->bone_buf->envelope_distance_buf.append(
+          {*(float4 *)head_sph, *(float4 *)tail_sph, *(float3 *)xaxis},

@@ -880,0 +905,4 @@
+    if (ctx->bone_buf && ctx->is_filled) {
+      ctx->bone_buf->custom_shape_fill
+          .lookup_or_add_cb(surf,
+                            [ctx]() {

@@ -921,0 +984,4 @@
+    inst_data.set_color(float4(UNPACK3(color), wire_width / WIRE_WIDTH_COMPRESSION));
+
+    if (ctx->bone_buf) {
+      ctx->bone_buf->custom_shape_wire

@@ -1016,0 +1148,4 @@
+        geom = ctx->shapes->arrows.get();
+        break;
+      case OB_EMPTY_IMAGE:
+        /* Not supported. */

@@ -1720,2 +1922,3 @@
   /*  Draw tip point */
-  if (select_id != -1) {
+#ifndef NO_LEGACY_OVERLAY
+  if (select_id != -1 && ctx->bone_buf == nullptr) {

@@ -1733,3 +1938,3 @@
   }
   else {
-    drw_shgroup_bone_point(ctx, bone.disp_tail_mat(), col_solid, col_hint_tail, col_wire_tail);
+    drw_shgroup_bone_sphere(ctx,

@@ -2124,2 +2365,4 @@
     const float(*disp_mat)[4] = bone.disp_mat();
 
+    if (ctx->bone_buf) {
+      /* TODO(fclem): This is the new pipeline. The code below it should then be removed. */

@@ -2193,2 +2481,4 @@
     const float *col_hint = get_bone_hint_color(ctx, boneflag);
 
+    if (ctx->bone_buf) {
+      /* TODO(fclem): This is the new pipeline. The code below it should then be removed. */

@@ -2580,1 +2985,3 @@
-  for (eBone = static_cast<EditBone *>(arm->edbo->first), index = ob_orig->runtime->select_id;
+  for (eBone = static_cast<EditBone *>(arm->edbo->first),
+      /* Note: Selection Next handles the object id merging later. */
+       index = ctx->bone_buf ? 0x0 : ob_orig->runtime->select_id;

@@ -2642,2 +3049,3 @@
 
-  ctx->draw_mode = ARM_DRAW_MODE_OBJECT; /* Will likely be set to ARM_DRAW_MODE_POSE below. */
+  ctx->draw_mode = ARM_DRAW_MODE_OBJECT; /* Will likely be set to
+                                                            ARM_DRAW_MODE_POSE below. */

@@ -2701,1 +3110,4 @@
+  /* TODO(fclem): Remove global access. This is only used for culling in selection mode.
+   * This is just a workaround for slow selection queries. Selection-next will not have this issue.
+   */
   const DRWView *view = is_pose_select ? DRW_view_default_get() : nullptr;

@@ -2776,2 +3188,3 @@
 {
-  BLI_assert(BLI_memory_is_zero(ctx, sizeof(*ctx)));
+  /* Not true anymore. */
+  // BLI_assert(BLI_memory_is_zero(ctx, sizeof(*ctx)));

@@ -0,0 +110,4 @@
+ public:
+  Armatures(const SelectionType selection_type) : selection_type_(selection_type){};
+
+  void begin_sync(Resources &res, const State &state)

@@ -0,0 +145,4 @@
+        sub.shader_set(res.shaders.armature_envelope_fill.get());
+        sub.push_constant("alpha", 1.0f);
+        sub.push_constant("isDistance", true);
+        opaque.envelope_distance = ⊂

@@ -0,0 +183,4 @@
+    DRWState default_state = DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_LESS_EQUAL |
+                             DRW_STATE_WRITE_DEPTH | state.clipping_state;
+
+    {

@@ -0,0 +393,4 @@
+      transparent.relations = opaque.relations;
+    }
+
+    auto clear_buffers = [](BoneBuffers &bb) {

@@ -0,0 +416,4 @@
+      bb.custom_shape_wire.clear();
+    };
+
+    clear_buffers(transparent);

@@ -0,0 +433,4 @@
+    Resources *res = nullptr;
+    const ShapeCache *shapes = nullptr;
+
+    /* TODO: Legacy structures to be removed after overlay next is shipped. */

@@ -0,0 +539,4 @@
+      return;
+    }
+
+    auto end_sync = [&](BoneBuffers &bb) {

@@ -37,2 +37,3 @@
   {
-    MetaBall *mb = static_cast<MetaBall *>(ob_ref.object->data);
+    const Object *ob = ob_ref.object;
+    const MetaBall *mb = static_cast<MetaBall *>(ob->data);

@@ -118,0 +190,4 @@
+ * NOTE: This is not the correct normals.
+ * The correct smooth normals for the equator vertices should be
+ * {+-0.943608f * M_SQRT1_2, -0.331048f, +-0.943608f * M_SQRT1_2}
+ * but it creates problems for outlines when bones are scaled.

@@ -264,0 +415,4 @@
+  UNUSED_VARS(bone_octahedral_wire_lines);
+
+  /* Armature Octahedron. */
+  {

@@ -482,3 +485,4 @@
   BoneInstanceData() = default;
+
   /* Constructor used by metaball overlays and expected to be used for drawing
    * metaball_wire_sphere with armature wire shader that produces wide-lines. */

@@ -112,2 +114,4 @@
     }
 
+    if (sub_object_id == uint(-1)) {
+      /* WORKAROUND: Armature code set the sub_object_id to -1 when individual bones are not

@@ -116,0 +124,4 @@
+
+#ifdef DEBUG_PRINT
+    /* Print mapping from object name, select id and the mapping to internal select id.
+     * If something is wrong at this stage, it indicates an error in the caller code. */

@@ -250,0 +270,4 @@
+#ifdef DEBUG_PRINT
+    for (auto &hit : hit_results) {
+      /* Print hit results right out of the GPU selection buffer.
+       * If something is wrong at this stage, it indicates an error in the selection shaders. */