Cleanup: Use forward declarations to replace includes of BKE_attribute.hh

Remove most includes of this header inside other headers, to remove unnecessary
indirect includes which can have a impact on compile times. In the future we may
want more dedicated "_fwd.hh" headers, but until then, this sticks with the
solution in existing code.

Unfortunately it isn't yet possible to remove the include from `BKE_geometry_set.hh`.

intern/cycles/blender/attribute_convert.h

@@ -10,7 +10,6 @@
 #include "util/param.h"
 #include "util/types.h"
 
-#include "BKE_attribute.hh"
 #include "BLI_math_color.hh"
 #include "BLI_math_quaternion_types.hh"
 #include "BLI_math_vector_types.hh"

intern/cycles/blender/curves.cpp

@@ -20,6 +20,7 @@
 #include "util/hash.h"
 #include "util/log.h"
 
+#include "BKE_attribute.hh"
 #include "BKE_curves.hh"
 
 CCL_NAMESPACE_BEGIN

source/blender/blenkernel/BKE_curves.hh

@@ -21,11 +21,16 @@
 #include "BLI_vector.hh"
 #include "BLI_virtual_array.hh"
 
-#include "BKE_attribute.hh"
 #include "BKE_attribute_math.hh"
 #include "BKE_curves.h"
 
 struct MDeformVert;
+namespace blender::bke {
+class AnonymousAttributePropagationInfo;
+class AttributeAccessor;
+class MutableAttributeAccessor;
+enum class AttrDomain : int8_t;
+}  // namespace blender::bke
 
 namespace blender::bke {
 
@@ -372,9 +377,9 @@ class CurvesGeometry : public ::CurvesGeometry {
   void calculate_bezier_auto_handles();
 
   void remove_points(const IndexMask &points_to_delete,
-                     const AnonymousAttributePropagationInfo &propagation_info = {});
+                     const AnonymousAttributePropagationInfo &propagation_info);
   void remove_curves(const IndexMask &curves_to_delete,
-                     const AnonymousAttributePropagationInfo &propagation_info = {});
+                     const AnonymousAttributePropagationInfo &propagation_info);
 
   /**
    * Change the direction of selected curves (switch the start and end) without changing their

source/blender/blenkernel/BKE_geometry_set.hh

@@ -13,9 +13,11 @@
 
 #include "BLI_bounds_types.hh"
 #include "BLI_function_ref.hh"
+#include "BLI_implicit_sharing_ptr.hh"
 #include "BLI_map.hh"
 #include "BLI_math_vector_types.hh"
 
+/* For #Map. */
 #include "BKE_attribute.hh"
 
 struct Curves;
@@ -25,11 +27,18 @@ struct PointCloud;
 struct Volume;
 struct GreasePencil;
 namespace blender::bke {
+class AnonymousAttributePropagationInfo;
+class AttributeIDRef;
+class AttributeKind;
+class AttributeAccessor;
+class AttributeMetaData;
 class ComponentAttributeProviders;
 class CurvesEditHints;
 class Instances;
 class GeometryComponent;
 class GreasePencilEditHints;
+class MutableAttributeAccessor;
+enum class AttrDomain : int8_t;
 }  // namespace blender::bke
 
 namespace blender::bke {

source/blender/blenkernel/BKE_instances.hh

@@ -20,15 +20,28 @@
  */
 
 #include <mutex>
+#include <optional>
 
+#include "BLI_array.hh"
+#include "BLI_function_ref.hh"
 #include "BLI_math_matrix_types.hh"
 #include "BLI_vector.hh"
-#include "BLI_vector_set.hh"
 
-#include "BKE_attribute.hh"
+#include "DNA_customdata_types.h"
 
 struct Object;
 struct Collection;
+namespace blender {
+namespace index_mask {
+class IndexMask;
+}
+using index_mask::IndexMask;
+namespace bke {
+class AnonymousAttributePropagationInfo;
+class AttributeAccessor;
+class MutableAttributeAccessor;
+}  // namespace bke
+}  // namespace blender
 
 namespace blender::bke {
 

source/blender/blenkernel/BKE_mesh_sample.hh

@@ -15,7 +15,6 @@
 #include "FN_field.hh"
 #include "FN_multi_function.hh"
 
-#include "BKE_attribute.h"
 #include "BKE_geometry_fields.hh"
 
 struct Mesh;

source/blender/blenkernel/BKE_paint.hh

@@ -22,7 +22,6 @@
 #include "DNA_brush_enums.h"
 #include "DNA_object_enums.h"
 
-#include "BKE_attribute.h"
 #include "BKE_pbvh.hh"
 
 #include "bmesh.hh"
@@ -36,7 +35,11 @@ struct Brush;
 struct CurveMapping;
 struct Depsgraph;
 struct EnumPropertyItem;
-namespace blender::ed::sculpt_paint {
+namespace blender {
+namespace bke {
+enum class AttrDomain : int8_t;
+}
+namespace ed::sculpt_paint {
 namespace expand {
 struct Cache;
 }
@@ -44,7 +47,8 @@ namespace filter {
 struct Cache;
 }
 struct StrokeCache;
-}  // namespace blender::ed::sculpt_paint
+}  // namespace ed::sculpt_paint
+}  // namespace blender
 struct GHash;
 struct GridPaintMask;
 struct Image;

source/blender/blenkernel/BKE_pbvh_api.hh

@@ -25,7 +25,6 @@
 #include "DNA_customdata_types.h"
 
 /* For embedding CCGKey in iterator. */
-#include "BKE_attribute.h"
 #include "BKE_ccg.h"
 #include "BKE_pbvh.hh"
 
@@ -43,10 +42,15 @@ struct PBVHNode;
 struct SubdivCCG;
 struct Image;
 struct ImageUser;
-namespace blender::draw::pbvh {
+namespace blender {
+namespace bke {
+enum class AttrDomain : int8_t;
+}
+namespace draw::pbvh {
 struct PBVHBatches;
 struct PBVH_GPU_Args;
-}  // namespace blender::draw::pbvh
+}  // namespace draw::pbvh
+}  // namespace blender
 
 struct PBVHProxyNode {
   blender::Vector<blender::float3> co;

source/blender/blenkernel/intern/attribute.cc

@@ -26,7 +26,7 @@
 
 #include "BLT_translation.h"
 
-#include "BKE_attribute.h"
+#include "BKE_attribute.hh"
 #include "BKE_attribute.hh"
 #include "BKE_curves.hh"
 #include "BKE_customdata.hh"

source/blender/blenkernel/intern/curves_geometry.cc

@@ -24,6 +24,7 @@
 
 #include "DNA_curves_types.h"
 
+#include "BKE_attribute.hh"
 #include "BKE_attribute_math.hh"
 #include "BKE_curves.hh"
 #include "BKE_curves_utils.hh"

source/blender/blenkernel/intern/data_transfer.cc

@@ -18,7 +18,7 @@
 #include "BLI_math_matrix.h"
 #include "BLI_utildefines.h"
 
-#include "BKE_attribute.h"
+#include "BKE_attribute.hh"
 #include "BKE_attribute.hh"
 #include "BKE_customdata.hh"
 #include "BKE_data_transfer.h"

source/blender/blenkernel/intern/geometry_set.cc

@@ -8,7 +8,7 @@
 
 #include "BLT_translation.h"
 
-#include "BKE_attribute.h"
+#include "BKE_attribute.hh"
 #include "BKE_curves.hh"
 #include "BKE_geometry_set.hh"
 #include "BKE_geometry_set_instances.hh"

source/blender/blenkernel/intern/grease_pencil_convert_legacy.cc

@@ -6,6 +6,7 @@
  * \ingroup bke
  */
 
+#include "BKE_attribute.hh"
 #include "BKE_curves.hh"
 #include "BKE_grease_pencil.hh"
 #include "BKE_material.h"

source/blender/blenkernel/intern/material.cc

@@ -47,7 +47,7 @@
 #include "BLT_translation.h"
 
 #include "BKE_anim_data.h"
-#include "BKE_attribute.h"
+#include "BKE_attribute.hh"
 #include "BKE_brush.hh"
 #include "BKE_curve.hh"
 #include "BKE_displist.h"

source/blender/blenkernel/intern/mesh_remesh_voxel.cc

@@ -26,7 +26,7 @@
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 
-#include "BKE_attribute.h"
+#include "BKE_attribute.hh"
 #include "BKE_attribute.hh"
 #include "BKE_attribute_math.hh"
 #include "BKE_bvhutils.hh"

source/blender/blenkernel/intern/paint.cc

@@ -37,7 +37,7 @@
 
 #include "BLT_translation.h"
 
-#include "BKE_attribute.h"
+#include "BKE_attribute.hh"
 #include "BKE_attribute.hh"
 #include "BKE_brush.hh"
 #include "BKE_ccg.h"

source/blender/blenkernel/intern/shrinkwrap.cc

@@ -27,7 +27,7 @@
 #include "BLI_utildefines.h"
 
 #include "BKE_DerivedMesh.hh"
-#include "BKE_attribute.h"
+#include "BKE_attribute.hh"
 #include "BKE_cdderivedmesh.h"
 #include "BKE_lattice.hh"
 #include "BKE_lib_id.h"

source/blender/blenkernel/intern/subdiv_modifier.cc

@@ -2,7 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "BKE_attribute.h"
+#include "BKE_attribute.hh"
 #include "BKE_subdiv_modifier.hh"
 
 #include "MEM_guardedalloc.h"

source/blender/blenloader/intern/versioning_290.cc

@@ -47,7 +47,7 @@
 
 #include "BKE_animsys.h"
 #include "BKE_armature.hh"
-#include "BKE_attribute.h"
+#include "BKE_attribute.hh"
 #include "BKE_collection.h"
 #include "BKE_colortools.h"
 #include "BKE_cryptomatte.h"

source/blender/blenloader/intern/versioning_300.cc

@@ -58,7 +58,7 @@
 #include "BKE_animsys.h"
 #include "BKE_armature.hh"
 #include "BKE_asset.hh"
-#include "BKE_attribute.h"
+#include "BKE_attribute.hh"
 #include "BKE_collection.h"
 #include "BKE_colortools.h"
 #include "BKE_curve.hh"

source/blender/bmesh/intern/bmesh_interp.cc

@@ -21,7 +21,7 @@
 #include "BLI_string.h"
 #include "BLI_task.h"
 
-#include "BKE_attribute.h"
+#include "BKE_attribute.hh"
 #include "BKE_customdata.hh"
 #include "BKE_multires.hh"
 

source/blender/bmesh/operators/bmo_utils.cc

@@ -19,7 +19,7 @@
 #include "BLI_math_matrix.h"
 #include "BLI_math_vector.h"
 
-#include "BKE_attribute.h"
+#include "BKE_attribute.hh"
 #include "BKE_customdata.hh"
 #include "BKE_object.hh"
 

source/blender/draw/DRW_pbvh.hh

@@ -15,8 +15,10 @@
 #include "BLI_set.hh"
 #include "BLI_span.hh"
 #include "BLI_struct_equality_utils.hh"
+#include "BLI_virtual_array.hh"
+
+#include "DNA_customdata_types.h"
 
-#include "BKE_attribute.hh"
 #include "BKE_ccg.h"
 
 struct GPUBatch;
@@ -26,6 +28,9 @@ struct CustomData;
 struct SubdivCCG;
 struct BMesh;
 struct BMFace;
+namespace blender::bke {
+enum class AttrDomain : int8_t;
+}
 
 namespace blender::draw::pbvh {
 

source/blender/draw/engines/overlay/overlay_grease_pencil.cc

@@ -10,6 +10,7 @@
 
 #include "ED_grease_pencil.hh"
 
+#include "BKE_attribute.hh"
 #include "BKE_grease_pencil.hh"
 
 #include "overlay_private.hh"

source/blender/draw/intern/draw_attributes.cc

@@ -4,6 +4,8 @@
 
 #include "BLI_string.h"
 
+#include "BKE_attribute.hh"
+
 #include "draw_attributes.hh"
 
 /* Return true if the given DRW_AttributeRequest is already in the requests. */
@@ -40,7 +42,7 @@ static void drw_attributes_merge_requests(const DRW_Attributes *src_requests,
 
 void drw_attributes_clear(DRW_Attributes *attributes)
 {
-  memset(attributes, 0, sizeof(DRW_Attributes));
+  *attributes = {};
 }
 
 void drw_attributes_merge(DRW_Attributes *dst, const DRW_Attributes *src, std::mutex &render_mutex)

source/blender/draw/intern/draw_attributes.hh

@@ -14,12 +14,14 @@
 
 #include "DNA_customdata_types.h"
 
-#include "BKE_attribute.hh"
-
 #include "BLI_sys_types.h"
 
 #include "GPU_shader.h"
 
+namespace blender::bke {
+enum class AttrDomain : int8_t;
+}
+
 struct DRW_AttributeRequest {
   eCustomDataType cd_type;
   int layer_index;

source/blender/draw/intern/draw_cache_impl_grease_pencil.cc

@@ -8,6 +8,7 @@
  * \brief Grease Pencil API for render engines
  */
 
+#include "BKE_attribute.hh"
 #include "BKE_curves.hh"
 #include "BKE_grease_pencil.h"
 #include "BKE_grease_pencil.hh"

source/blender/draw/intern/draw_curves.cc

@@ -13,6 +13,7 @@
 
 #include "DNA_curves_types.h"
 
+#include "BKE_attribute.hh"
 #include "BKE_curves.hh"
 
 #include "GPU_batch.h"

source/blender/draw/intern/draw_curves_private.hh

@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include "BKE_attribute.h"
 #include "GPU_shader.h"
 
 #include "draw_attributes.hh"

source/blender/draw/intern/draw_manager_data.cc

@@ -12,6 +12,7 @@
 #include "draw_manager.h"
 #include "draw_pbvh.hh"
 
+#include "BKE_attribute.hh"
 #include "BKE_curve.hh"
 #include "BKE_duplilist.h"
 #include "BKE_global.h"

source/blender/editors/curves/intern/curves_add.cc

@@ -9,6 +9,7 @@
 #include "BLI_math_base_safe.h"
 #include "BLI_rand.hh"
 
+#include "BKE_attribute.hh"
 #include "BKE_context.hh"
 #include "BKE_curves.hh"
 #include "BKE_node.hh"

source/blender/editors/curves/intern/curves_attribute_set.cc

@@ -8,7 +8,7 @@
 
 #include "BLI_generic_pointer.hh"
 
-#include "BKE_attribute.h"
+#include "BKE_attribute.hh"
 #include "BKE_attribute_math.hh"
 #include "BKE_context.hh"
 #include "BKE_report.h"

source/blender/editors/curves/intern/curves_draw.cc

@@ -9,7 +9,7 @@
 #include "BLI_math_vector.h"
 #include "BLI_mempool.h"
 
-#include "BKE_attribute.h"
+#include "BKE_attribute.hh"
 #include "BKE_context.hh"
 #include "BKE_curves.hh"
 #include "BKE_report.h"

source/blender/editors/curves/intern/curves_edit.cc

@@ -8,6 +8,7 @@
 
 #include "BLI_array_utils.hh"
 
+#include "BKE_attribute.hh"
 #include "BKE_curves.hh"
 
 #include "ED_curves.hh"
@@ -24,10 +25,10 @@ bool remove_selection(bke::CurvesGeometry &curves, const bke::AttrDomain selecti
   const IndexMask mask = IndexMask::from_bools(selection, memory);
   switch (selection_domain) {
     case bke::AttrDomain::Point:
-      curves.remove_points(mask);
+      curves.remove_points(mask, {});
       break;
     case bke::AttrDomain::Curve:
-      curves.remove_curves(mask);
+      curves.remove_curves(mask, {});
       break;
     default:
       BLI_assert_unreachable();

source/blender/editors/curves/intern/curves_masks.cc

@@ -8,6 +8,7 @@
 
 #include "BLI_rand.hh"
 
+#include "BKE_attribute.hh"
 #include "BKE_curves.hh"
 
 #include "ED_curves.hh"

source/blender/editors/geometry/geometry_attributes.cc

@@ -14,7 +14,7 @@
 
 #include "BLI_color.hh"
 
-#include "BKE_attribute.h"
+#include "BKE_attribute.hh"
 #include "BKE_context.hh"
 #include "BKE_deform.h"
 #include "BKE_geometry_set.hh"

source/blender/editors/grease_pencil/intern/grease_pencil_add.cc

@@ -9,6 +9,7 @@
 #include <array>
 #include <iomanip>
 
+#include "BKE_attribute.hh"
 #include "BKE_curves.hh"
 #include "BKE_grease_pencil.hh"
 

source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc

@@ -16,6 +16,7 @@
 
 #include "DNA_material_types.h"
 
+#include "BKE_attribute.hh"
 #include "BKE_context.hh"
 #include "BKE_curves_utils.hh"
 #include "BKE_grease_pencil.hh"
@@ -547,7 +548,7 @@ static int grease_pencil_stroke_simplify_exec(bContext *C, wmOperator *op)
 
     if (total_points_to_delete > 0) {
       IndexMaskMemory memory;
-      curves.remove_points(IndexMask::from_bools(points_to_delete, memory));
+      curves.remove_points(IndexMask::from_bools(points_to_delete, memory), {});
       info.drawing.tag_topology_changed();
       changed = true;
     }
@@ -696,7 +697,7 @@ static int grease_pencil_delete_exec(bContext *C, wmOperator * /*op*/)
 
     bke::CurvesGeometry &curves = info.drawing.strokes_for_write();
     if (selection_domain == bke::AttrDomain::Curve) {
-      curves.remove_curves(elements);
+      curves.remove_curves(elements, {});
     }
     else if (selection_domain == bke::AttrDomain::Point) {
       curves = remove_points_and_split(curves, elements);
@@ -844,7 +845,7 @@ static int grease_pencil_dissolve_exec(bContext *C, wmOperator *op)
 
     const Array<bool> points_to_dissolve = get_points_to_dissolve(curves, points, mode);
     if (points_to_dissolve.as_span().contains(true)) {
-      curves.remove_points(IndexMask::from_bools(points_to_dissolve, memory));
+      curves.remove_points(IndexMask::from_bools(points_to_dissolve, memory), {});
       info.drawing.tag_topology_changed();
       changed = true;
     }
@@ -1605,7 +1606,7 @@ static int grease_pencil_clean_loose_exec(bContext *C, wmOperator *op)
           return points_by_curve[i].size() <= limit;
         });
 
-    curves.remove_curves(curves_to_delete);
+    curves.remove_curves(curves_to_delete, {});
   });
 
   DEG_id_tag_update(&grease_pencil.id, ID_RECALC_GEOMETRY);

source/blender/editors/grease_pencil/intern/grease_pencil_material.cc

@@ -8,6 +8,7 @@
 
 #include "DNA_material_types.h"
 
+#include "BKE_attribute.hh"
 #include "BKE_context.hh"
 #include "BKE_curves_utils.hh"
 #include "BKE_grease_pencil.hh"

source/blender/editors/grease_pencil/intern/grease_pencil_select.cc

@@ -8,6 +8,7 @@
 
 #include "BLI_vector_set.hh"
 
+#include "BKE_attribute.hh"
 #include "BKE_context.hh"
 #include "BKE_grease_pencil.hh"
 

source/blender/editors/grease_pencil/intern/grease_pencil_utils.cc

@@ -6,6 +6,7 @@
  * \ingroup edgreasepencil
  */
 
+#include "BKE_attribute.hh"
 #include "BKE_brush.hh"
 #include "BKE_context.hh"
 #include "BKE_grease_pencil.hh"

source/blender/editors/include/ED_curves.hh

@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include "BKE_attribute.hh"
 #include "BKE_crazyspace.hh"
 #include "BKE_curves.hh"
 
@@ -26,6 +25,10 @@ struct ViewContext;
 struct rcti;
 struct TransVertStore;
 struct wmKeyConfig;
+namespace blender::bke {
+enum class AttrDomain : int8_t;
+class GSpanAttributeWriter;
+}  // namespace blender::bke
 
 /* -------------------------------------------------------------------- */
 /** \name C Wrappers

source/blender/editors/include/ED_geometry.hh

@@ -8,21 +8,20 @@
 
 #pragma once
 
+#include "BLI_generic_pointer.hh"
 #include "BLI_string_ref.hh"
 
 #include "DNA_customdata_types.h"
 
-#include "BKE_attribute.h"
 #include "BKE_screen.hh"
 
 struct Mesh;
 struct ReportList;
-
-#include "BLI_generic_pointer.hh"
-#include "BLI_string_ref.hh"
-
 struct PointerRNA;
 struct PropertyRNA;
+namespace blender::bke {
+enum class AttrDomain : int8_t;
+}
 
 namespace blender::ed::geometry {
 

source/blender/editors/include/ED_grease_pencil.hh

@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include "BKE_attribute.hh"
 #include "BKE_grease_pencil.hh"
 
 #include "BLI_generic_span.hh"
@@ -26,6 +25,11 @@ struct ToolSettings;
 struct Scene;
 struct ViewDepths;
 struct View3D;
+namespace blender {
+namespace bke {
+enum class AttrDomain : int8_t;
+}
+}  // namespace blender
 
 enum {
   LAYER_REORDER_ABOVE,

source/blender/editors/mesh/editmesh_tools.cc

@@ -32,7 +32,7 @@
 #include "BLI_sort_utils.h"
 #include "BLI_string.h"
 
-#include "BKE_attribute.h"
+#include "BKE_attribute.hh"
 #include "BKE_context.hh"
 #include "BKE_customdata.hh"
 #include "BKE_deform.h"

source/blender/editors/mesh/mesh_data.cc

@@ -17,7 +17,7 @@
 #include "BLI_array.hh"
 #include "BLI_utildefines.h"
 
-#include "BKE_attribute.h"
+#include "BKE_attribute.hh"
 #include "BKE_attribute.hh"
 #include "BKE_context.hh"
 #include "BKE_customdata.hh"

source/blender/editors/physics/dynamicpaint_ops.cc

@@ -23,7 +23,7 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
-#include "BKE_attribute.h"
+#include "BKE_attribute.hh"
 #include "BKE_context.hh"
 #include "BKE_deform.h"
 #include "BKE_dynamicpaint.h"

source/blender/editors/sculpt_paint/curves_sculpt_ops.cc

@@ -8,6 +8,7 @@
 #include "BLI_utildefines.h"
 #include "BLI_vector_set.hh"
 
+#include "BKE_attribute.hh"
 #include "BKE_brush.hh"
 #include "BKE_bvhutils.hh"
 #include "BKE_context.hh"

source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc

@@ -17,6 +17,7 @@
 
 #include "DEG_depsgraph.hh"
 
+#include "BKE_attribute.hh"
 #include "BKE_attribute_math.hh"
 #include "BKE_brush.hh"
 #include "BKE_bvhutils.hh"

source/blender/editors/sculpt_paint/grease_pencil_erase.cc

@@ -10,6 +10,7 @@
 #include "BLI_math_geom.h"
 #include "BLI_task.hh"
 
+#include "BKE_attribute.hh"
 #include "BKE_brush.hh"
 #include "BKE_colortools.h"
 #include "BKE_context.hh"

source/blender/editors/sculpt_paint/grease_pencil_paint.cc

@@ -2,6 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
+#include "BKE_attribute.hh"
 #include "BKE_brush.hh"
 #include "BKE_colortools.h"
 #include "BKE_context.hh"
@@ -516,7 +517,7 @@ void PaintOperation::simplify_stroke(bke::greasepencil::Drawing &drawing, const
 
   if (total_points_to_delete > 0) {
     IndexMaskMemory memory;
-    curves.remove_points(IndexMask::from_bools(points_to_delete, memory));
+    curves.remove_points(IndexMask::from_bools(points_to_delete, memory), {});
   }
 }
 

source/blender/editors/sculpt_paint/paint_intern.hh

@@ -35,6 +35,7 @@ struct SpaceImage;
 struct VPaint;
 struct ViewContext;
 struct bContext;
+struct ReportList;
 struct wmEvent;
 struct wmKeyConfig;
 struct wmKeyMap;

source/blender/editors/sculpt_paint/paint_vertex.cc

@@ -35,7 +35,7 @@
 #include "RNA_access.hh"
 #include "RNA_define.hh"
 
-#include "BKE_attribute.h"
+#include "BKE_attribute.hh"
 #include "BKE_attribute.hh"
 #include "BKE_brush.hh"
 #include "BKE_colortools.h"

source/blender/editors/sculpt_paint/paint_weight.cc

@@ -31,7 +31,7 @@
 
 #include "RNA_access.hh"
 
-#include "BKE_attribute.h"
+#include "BKE_attribute.hh"
 #include "BKE_attribute.hh"
 #include "BKE_brush.hh"
 #include "BKE_colortools.h"

source/blender/editors/sculpt_paint/sculpt.cc

@@ -37,7 +37,7 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
-#include "BKE_attribute.h"
+#include "BKE_attribute.hh"
 #include "BKE_attribute.hh"
 #include "BKE_brush.hh"
 #include "BKE_ccg.h"

source/blender/editors/sculpt_paint/sculpt_ops.cc

@@ -28,7 +28,7 @@
 #include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
-#include "BKE_attribute.h"
+#include "BKE_attribute.hh"
 #include "BKE_brush.hh"
 #include "BKE_ccg.h"
 #include "BKE_context.hh"

source/blender/editors/transform/transform_convert_curves.cc

@@ -13,6 +13,7 @@
 #include "BLI_math_matrix.h"
 #include "BLI_span.hh"
 
+#include "BKE_attribute.hh"
 #include "BKE_curves.hh"
 
 #include "ED_curves.hh"

source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp

@@ -28,7 +28,7 @@
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 
-#include "BKE_attribute.h"
+#include "BKE_attribute.hh"
 #include "BKE_collection.h"
 #include "BKE_customdata.hh"
 #include "BKE_global.h"

source/blender/geometry/GEO_mesh_copy_selection.hh

@@ -8,16 +8,15 @@
 
 #include "BLI_index_mask.hh"
 
-#include "BKE_attribute.h"
-
 struct Mesh;
 namespace blender {
 namespace fn {
 template<typename T> class Field;
 }
 namespace bke {
+enum class AttrDomain : int8_t;
 class AnonymousAttributePropagationInfo;
-}
+}  // namespace bke
 }  // namespace blender
 
 namespace blender::geometry {

source/blender/geometry/GEO_mesh_primitive_cylinder_cone.hh

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "BKE_attribute.hh"
+#include "BKE_anonymous_attribute_id.hh"
 
 struct Mesh;
 

source/blender/geometry/GEO_mesh_split_edges.hh

@@ -6,9 +6,10 @@
 
 #include "BLI_index_mask.hh"
 
-#include "BKE_attribute.hh"
-
 struct Mesh;
+namespace blender::bke {
+class AnonymousAttributePropagationInfo;
+}
 
 namespace blender::geometry {
 

source/blender/geometry/GEO_point_merge_by_distance.hh

@@ -4,12 +4,12 @@
 
 #include "BLI_index_mask.hh"
 
-#include "BKE_attribute.hh"
-
 #pragma once
 
 struct PointCloud;
-class PointCloudComponent;
+namespace blender::bke {
+class AnonymousAttributePropagationInfo;
+}
 
 /** \file
  * \ingroup geo

source/blender/geometry/intern/mesh_primitive_cylinder_cone.cc

@@ -2,6 +2,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
+#include "BKE_attribute.hh"
 #include "BKE_mesh.hh"
 
 #include "GEO_mesh_primitive_cylinder_cone.hh"

source/blender/gpu/intern/gpu_shader_builder_stubs.cc

@@ -13,7 +13,7 @@
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
-#include "BKE_attribute.h"
+#include "BKE_attribute.hh"
 #include "BKE_customdata.hh"
 #include "BKE_global.h"
 #include "BKE_material.h"

source/blender/io/alembic/exporter/abc_writer_mesh.cc

@@ -14,7 +14,7 @@
 #include "BLI_assert.h"
 #include "BLI_math_vector.h"
 
-#include "BKE_attribute.h"
+#include "BKE_attribute.hh"
 #include "BKE_attribute.hh"
 #include "BKE_customdata.hh"
 #include "BKE_lib_id.h"

source/blender/io/ply/importer/ply_import_mesh.cc

@@ -6,7 +6,7 @@
  * \ingroup ply
  */
 
-#include "BKE_attribute.h"
+#include "BKE_attribute.hh"
 #include "BKE_attribute.hh"
 #include "BKE_customdata.hh"
 #include "BKE_lib_id.h"

source/blender/io/usd/hydra/curves.cc

@@ -7,7 +7,7 @@
 #include <pxr/base/gf/vec2f.h>
 #include <pxr/imaging/hd/tokens.h>
 
-#include "BKE_customdata.hh"
+#include "BKE_attribute.hh"
 #include "BKE_material.h"
 
 #include "BKE_curves.hh"

source/blender/io/usd/intern/usd_reader_mesh.h

@@ -5,7 +5,6 @@
  * Modifications Copyright 2021 Tangent Animation and. NVIDIA Corporation. All rights reserved. */
 #pragma once
 
-#include "BKE_attribute.hh"
 #include "BLI_span.hh"
 
 #include "usd.h"

source/blender/io/usd/intern/usd_writer_curves.cc

@@ -14,6 +14,7 @@
 #include "usd_hierarchy_iterator.h"
 #include "usd_writer_curves.h"
 
+#include "BKE_attribute.hh"
 #include "BKE_curve_legacy_convert.hh"
 #include "BKE_curves.hh"
 #include "BKE_lib_id.h"

source/blender/io/usd/intern/usd_writer_mesh.cc

@@ -17,7 +17,7 @@
 #include "BLI_math_vector.h"
 #include "BLI_math_vector_types.hh"
 
-#include "BKE_attribute.h"
+#include "BKE_attribute.hh"
 #include "BKE_customdata.hh"
 #include "BKE_lib_id.h"
 #include "BKE_material.h"

source/blender/io/usd/intern/usd_writer_mesh.h

@@ -8,10 +8,13 @@
 
 #include "BLI_map.hh"
 
-#include "BKE_attribute.hh"
-
 #include <pxr/usd/usdGeom/mesh.h>
 
+namespace blender::bke {
+class AttributeIDRef;
+struct AttributeMetaData;
+}  // namespace blender::bke
+
 namespace blender::io::usd {
 
 struct USDMeshData;

source/blender/makesrna/intern/rna_material.cc

@@ -65,6 +65,7 @@ const EnumPropertyItem rna_enum_ramp_blend_items[] = {
 #  include "DNA_screen_types.h"
 #  include "DNA_space_types.h"
 
+#  include "BKE_attribute.hh"
 #  include "BKE_colorband.h"
 #  include "BKE_context.hh"
 #  include "BKE_gpencil_legacy.h"

source/blender/makesrna/intern/rna_mesh.cc

@@ -21,7 +21,7 @@
 #include "BLI_string_utf8.h"
 #include "BLI_utildefines.h"
 
-#include "BKE_attribute.h"
+#include "BKE_attribute.hh"
 #include "BKE_editmesh.hh"
 #include "BKE_mesh_types.hh"
 

source/blender/makesrna/intern/rna_nodetree.cc

@@ -32,7 +32,7 @@
 #include "DNA_texture_types.h"
 
 #include "BKE_animsys.h"
-#include "BKE_attribute.h"
+#include "BKE_attribute.hh"
 #include "BKE_cryptomatte.h"
 #include "BKE_geometry_set.hh"
 #include "BKE_image.h"

source/blender/nodes/NOD_geometry_nodes_log.hh

@@ -35,7 +35,6 @@
 #include "BLI_generic_pointer.hh"
 #include "BLI_multi_value_map.hh"
 
-#include "BKE_attribute.h"
 #include "BKE_geometry_set.hh"
 #include "BKE_node_tree_zones.hh"
 #include "BKE_viewer_path.hh"