From edf8a776ac76e822fa58a8f1ea1d21271bf5e919 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Wed, 20 Dec 2023 13:25:08 -0500 Subject: [PATCH] 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 | 1 - intern/cycles/blender/curves.cpp | 1 + source/blender/blenkernel/BKE_curves.hh | 11 ++++++++--- source/blender/blenkernel/BKE_geometry_set.hh | 9 +++++++++ source/blender/blenkernel/BKE_instances.hh | 17 +++++++++++++++-- source/blender/blenkernel/BKE_mesh_sample.hh | 1 - source/blender/blenkernel/BKE_paint.hh | 10 +++++++--- source/blender/blenkernel/BKE_pbvh_api.hh | 10 +++++++--- source/blender/blenkernel/intern/attribute.cc | 2 +- .../blenkernel/intern/curves_geometry.cc | 1 + .../blender/blenkernel/intern/data_transfer.cc | 2 +- .../blender/blenkernel/intern/geometry_set.cc | 2 +- .../intern/grease_pencil_convert_legacy.cc | 1 + source/blender/blenkernel/intern/material.cc | 2 +- .../blenkernel/intern/mesh_remesh_voxel.cc | 2 +- source/blender/blenkernel/intern/paint.cc | 2 +- source/blender/blenkernel/intern/shrinkwrap.cc | 2 +- .../blenkernel/intern/subdiv_modifier.cc | 2 +- .../blender/blenloader/intern/versioning_290.cc | 2 +- .../blender/blenloader/intern/versioning_300.cc | 2 +- source/blender/bmesh/intern/bmesh_interp.cc | 2 +- source/blender/bmesh/operators/bmo_utils.cc | 2 +- source/blender/draw/DRW_pbvh.hh | 7 ++++++- .../engines/overlay/overlay_grease_pencil.cc | 1 + source/blender/draw/intern/draw_attributes.cc | 4 +++- source/blender/draw/intern/draw_attributes.hh | 6 ++++-- .../intern/draw_cache_impl_grease_pencil.cc | 1 + source/blender/draw/intern/draw_curves.cc | 1 + .../blender/draw/intern/draw_curves_private.hh | 1 - source/blender/draw/intern/draw_manager_data.cc | 1 + .../blender/editors/curves/intern/curves_add.cc | 1 + .../curves/intern/curves_attribute_set.cc | 2 +- .../editors/curves/intern/curves_draw.cc | 2 +- .../editors/curves/intern/curves_edit.cc | 5 +++-- .../editors/curves/intern/curves_masks.cc | 1 + .../editors/geometry/geometry_attributes.cc | 2 +- .../grease_pencil/intern/grease_pencil_add.cc | 1 + .../grease_pencil/intern/grease_pencil_edit.cc | 9 +++++---- .../intern/grease_pencil_material.cc | 1 + .../intern/grease_pencil_select.cc | 1 + .../grease_pencil/intern/grease_pencil_utils.cc | 1 + source/blender/editors/include/ED_curves.hh | 5 ++++- source/blender/editors/include/ED_geometry.hh | 9 ++++----- .../blender/editors/include/ED_grease_pencil.hh | 6 +++++- source/blender/editors/mesh/editmesh_tools.cc | 2 +- source/blender/editors/mesh/mesh_data.cc | 2 +- .../blender/editors/physics/dynamicpaint_ops.cc | 2 +- .../editors/sculpt_paint/curves_sculpt_ops.cc | 1 + .../sculpt_paint/curves_sculpt_snake_hook.cc | 1 + .../editors/sculpt_paint/grease_pencil_erase.cc | 1 + .../editors/sculpt_paint/grease_pencil_paint.cc | 3 ++- .../editors/sculpt_paint/paint_intern.hh | 1 + .../editors/sculpt_paint/paint_vertex.cc | 2 +- .../editors/sculpt_paint/paint_weight.cc | 2 +- source/blender/editors/sculpt_paint/sculpt.cc | 2 +- .../blender/editors/sculpt_paint/sculpt_ops.cc | 2 +- .../transform/transform_convert_curves.cc | 1 + .../blender_interface/BlenderStrokeRenderer.cpp | 2 +- .../blender/geometry/GEO_mesh_copy_selection.hh | 5 ++--- .../GEO_mesh_primitive_cylinder_cone.hh | 2 +- source/blender/geometry/GEO_mesh_split_edges.hh | 5 +++-- .../geometry/GEO_point_merge_by_distance.hh | 6 +++--- .../intern/mesh_primitive_cylinder_cone.cc | 1 + .../gpu/intern/gpu_shader_builder_stubs.cc | 2 +- .../io/alembic/exporter/abc_writer_mesh.cc | 2 +- .../blender/io/ply/importer/ply_import_mesh.cc | 2 +- source/blender/io/usd/hydra/curves.cc | 2 +- source/blender/io/usd/intern/usd_reader_mesh.h | 1 - .../blender/io/usd/intern/usd_writer_curves.cc | 1 + source/blender/io/usd/intern/usd_writer_mesh.cc | 2 +- source/blender/io/usd/intern/usd_writer_mesh.h | 7 +++++-- source/blender/makesrna/intern/rna_material.cc | 1 + source/blender/makesrna/intern/rna_mesh.cc | 2 +- source/blender/makesrna/intern/rna_nodetree.cc | 2 +- source/blender/nodes/NOD_geometry_nodes_log.hh | 1 - 75 files changed, 147 insertions(+), 75 deletions(-) diff --git a/intern/cycles/blender/attribute_convert.h b/intern/cycles/blender/attribute_convert.h index 34b75d55855..00c7533e636 100644 --- a/intern/cycles/blender/attribute_convert.h +++ b/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" diff --git a/intern/cycles/blender/curves.cpp b/intern/cycles/blender/curves.cpp index 18f9160bf2e..8fc3d82af76 100644 --- a/intern/cycles/blender/curves.cpp +++ b/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 diff --git a/source/blender/blenkernel/BKE_curves.hh b/source/blender/blenkernel/BKE_curves.hh index 5a7b6b94234..d247d4d003a 100644 --- a/source/blender/blenkernel/BKE_curves.hh +++ b/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 diff --git a/source/blender/blenkernel/BKE_geometry_set.hh b/source/blender/blenkernel/BKE_geometry_set.hh index c881408e60a..2bd15199383 100644 --- a/source/blender/blenkernel/BKE_geometry_set.hh +++ b/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 { diff --git a/source/blender/blenkernel/BKE_instances.hh b/source/blender/blenkernel/BKE_instances.hh index c148d5d4c93..5cfdf9c0934 100644 --- a/source/blender/blenkernel/BKE_instances.hh +++ b/source/blender/blenkernel/BKE_instances.hh @@ -20,15 +20,28 @@ */ #include +#include +#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 { diff --git a/source/blender/blenkernel/BKE_mesh_sample.hh b/source/blender/blenkernel/BKE_mesh_sample.hh index c90bcb4ecae..0976181499b 100644 --- a/source/blender/blenkernel/BKE_mesh_sample.hh +++ b/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; diff --git a/source/blender/blenkernel/BKE_paint.hh b/source/blender/blenkernel/BKE_paint.hh index 84e1a22c864..40c5c887000 100644 --- a/source/blender/blenkernel/BKE_paint.hh +++ b/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; diff --git a/source/blender/blenkernel/BKE_pbvh_api.hh b/source/blender/blenkernel/BKE_pbvh_api.hh index 4092445609b..0e1a27efdc6 100644 --- a/source/blender/blenkernel/BKE_pbvh_api.hh +++ b/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 co; diff --git a/source/blender/blenkernel/intern/attribute.cc b/source/blender/blenkernel/intern/attribute.cc index a2de6149a25..9b6e2a92e60 100644 --- a/source/blender/blenkernel/intern/attribute.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/curves_geometry.cc b/source/blender/blenkernel/intern/curves_geometry.cc index e27c4082135..ddf3d89bda8 100644 --- a/source/blender/blenkernel/intern/curves_geometry.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/data_transfer.cc b/source/blender/blenkernel/intern/data_transfer.cc index 72ea687360a..1459be0200b 100644 --- a/source/blender/blenkernel/intern/data_transfer.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/geometry_set.cc b/source/blender/blenkernel/intern/geometry_set.cc index 13af9883547..3f9aca4f1ca 100644 --- a/source/blender/blenkernel/intern/geometry_set.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/grease_pencil_convert_legacy.cc b/source/blender/blenkernel/intern/grease_pencil_convert_legacy.cc index 5515c8f3594..7450f5bf0f7 100644 --- a/source/blender/blenkernel/intern/grease_pencil_convert_legacy.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/material.cc b/source/blender/blenkernel/intern/material.cc index f1bdecc2ddb..0f40034b5d7 100644 --- a/source/blender/blenkernel/intern/material.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/mesh_remesh_voxel.cc b/source/blender/blenkernel/intern/mesh_remesh_voxel.cc index 08134c2e9f1..cb28c149486 100644 --- a/source/blender/blenkernel/intern/mesh_remesh_voxel.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/paint.cc b/source/blender/blenkernel/intern/paint.cc index 758d54bbdb7..29ec7f6d90e 100644 --- a/source/blender/blenkernel/intern/paint.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/shrinkwrap.cc b/source/blender/blenkernel/intern/shrinkwrap.cc index 667688e5687..a0547e9ecdb 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.cc +++ b/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" diff --git a/source/blender/blenkernel/intern/subdiv_modifier.cc b/source/blender/blenkernel/intern/subdiv_modifier.cc index b670e39e28a..c7ecd3af3b4 100644 --- a/source/blender/blenkernel/intern/subdiv_modifier.cc +++ b/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" diff --git a/source/blender/blenloader/intern/versioning_290.cc b/source/blender/blenloader/intern/versioning_290.cc index 49da0ff4bfe..227d9a16704 100644 --- a/source/blender/blenloader/intern/versioning_290.cc +++ b/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" diff --git a/source/blender/blenloader/intern/versioning_300.cc b/source/blender/blenloader/intern/versioning_300.cc index c11812a04a1..194273b83e1 100644 --- a/source/blender/blenloader/intern/versioning_300.cc +++ b/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" diff --git a/source/blender/bmesh/intern/bmesh_interp.cc b/source/blender/bmesh/intern/bmesh_interp.cc index 50fa8f7d043..a2deece1932 100644 --- a/source/blender/bmesh/intern/bmesh_interp.cc +++ b/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" diff --git a/source/blender/bmesh/operators/bmo_utils.cc b/source/blender/bmesh/operators/bmo_utils.cc index 007567e8be8..4045c34d64a 100644 --- a/source/blender/bmesh/operators/bmo_utils.cc +++ b/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" diff --git a/source/blender/draw/DRW_pbvh.hh b/source/blender/draw/DRW_pbvh.hh index 62aad0d019e..97f3e7fb16e 100644 --- a/source/blender/draw/DRW_pbvh.hh +++ b/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 { diff --git a/source/blender/draw/engines/overlay/overlay_grease_pencil.cc b/source/blender/draw/engines/overlay/overlay_grease_pencil.cc index f12026d959d..3f499816e58 100644 --- a/source/blender/draw/engines/overlay/overlay_grease_pencil.cc +++ b/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" diff --git a/source/blender/draw/intern/draw_attributes.cc b/source/blender/draw/intern/draw_attributes.cc index 80661465443..a06b4b86ef2 100644 --- a/source/blender/draw/intern/draw_attributes.cc +++ b/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) diff --git a/source/blender/draw/intern/draw_attributes.hh b/source/blender/draw/intern/draw_attributes.hh index 848ca1c4784..5fb4cc9d1e0 100644 --- a/source/blender/draw/intern/draw_attributes.hh +++ b/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; diff --git a/source/blender/draw/intern/draw_cache_impl_grease_pencil.cc b/source/blender/draw/intern/draw_cache_impl_grease_pencil.cc index 36a24ee85dc..e5393e3b597 100644 --- a/source/blender/draw/intern/draw_cache_impl_grease_pencil.cc +++ b/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" diff --git a/source/blender/draw/intern/draw_curves.cc b/source/blender/draw/intern/draw_curves.cc index 44758adf14a..5b9d4456cfc 100644 --- a/source/blender/draw/intern/draw_curves.cc +++ b/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" diff --git a/source/blender/draw/intern/draw_curves_private.hh b/source/blender/draw/intern/draw_curves_private.hh index 9b10c0e62f3..6b58208ff1a 100644 --- a/source/blender/draw/intern/draw_curves_private.hh +++ b/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" diff --git a/source/blender/draw/intern/draw_manager_data.cc b/source/blender/draw/intern/draw_manager_data.cc index 251284cbee0..3f1f16dc479 100644 --- a/source/blender/draw/intern/draw_manager_data.cc +++ b/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" diff --git a/source/blender/editors/curves/intern/curves_add.cc b/source/blender/editors/curves/intern/curves_add.cc index c0b2034a455..980ec5765f3 100644 --- a/source/blender/editors/curves/intern/curves_add.cc +++ b/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" diff --git a/source/blender/editors/curves/intern/curves_attribute_set.cc b/source/blender/editors/curves/intern/curves_attribute_set.cc index 871bd4a1c86..5e35b12b6e8 100644 --- a/source/blender/editors/curves/intern/curves_attribute_set.cc +++ b/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" diff --git a/source/blender/editors/curves/intern/curves_draw.cc b/source/blender/editors/curves/intern/curves_draw.cc index 94038811f21..ac404d4c175 100644 --- a/source/blender/editors/curves/intern/curves_draw.cc +++ b/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" diff --git a/source/blender/editors/curves/intern/curves_edit.cc b/source/blender/editors/curves/intern/curves_edit.cc index 7f296ff9a8a..337d6f99bde 100644 --- a/source/blender/editors/curves/intern/curves_edit.cc +++ b/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(); diff --git a/source/blender/editors/curves/intern/curves_masks.cc b/source/blender/editors/curves/intern/curves_masks.cc index 0459d6465f7..8130528ace0 100644 --- a/source/blender/editors/curves/intern/curves_masks.cc +++ b/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" diff --git a/source/blender/editors/geometry/geometry_attributes.cc b/source/blender/editors/geometry/geometry_attributes.cc index 32c5730505f..90c76deff69 100644 --- a/source/blender/editors/geometry/geometry_attributes.cc +++ b/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" diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_add.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_add.cc index ae2262acb4d..03da46592e0 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_add.cc +++ b/source/blender/editors/grease_pencil/intern/grease_pencil_add.cc @@ -9,6 +9,7 @@ #include #include +#include "BKE_attribute.hh" #include "BKE_curves.hh" #include "BKE_grease_pencil.hh" diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc index a776f4d4490..d9544b182fc 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc +++ b/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 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); diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_material.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_material.cc index aea8264185d..d8106bb7c3c 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_material.cc +++ b/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" diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_select.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_select.cc index e6cb2cfa62f..a271c768929 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_select.cc +++ b/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" diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_utils.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_utils.cc index 4ae394d1545..6328aa73356 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_utils.cc +++ b/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" diff --git a/source/blender/editors/include/ED_curves.hh b/source/blender/editors/include/ED_curves.hh index 505d6a6b516..722175cf2c2 100644 --- a/source/blender/editors/include/ED_curves.hh +++ b/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 diff --git a/source/blender/editors/include/ED_geometry.hh b/source/blender/editors/include/ED_geometry.hh index b8ed845412b..bb5baf30bef 100644 --- a/source/blender/editors/include/ED_geometry.hh +++ b/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 { diff --git a/source/blender/editors/include/ED_grease_pencil.hh b/source/blender/editors/include/ED_grease_pencil.hh index 37b7d370447..af48ecae7d1 100644 --- a/source/blender/editors/include/ED_grease_pencil.hh +++ b/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, diff --git a/source/blender/editors/mesh/editmesh_tools.cc b/source/blender/editors/mesh/editmesh_tools.cc index e058b32c936..7a7fe0fa623 100644 --- a/source/blender/editors/mesh/editmesh_tools.cc +++ b/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" diff --git a/source/blender/editors/mesh/mesh_data.cc b/source/blender/editors/mesh/mesh_data.cc index 557d7ba0bd2..a0816e10ffc 100644 --- a/source/blender/editors/mesh/mesh_data.cc +++ b/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" diff --git a/source/blender/editors/physics/dynamicpaint_ops.cc b/source/blender/editors/physics/dynamicpaint_ops.cc index cc011498413..340f145e835 100644 --- a/source/blender/editors/physics/dynamicpaint_ops.cc +++ b/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" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc b/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc index 7425b8cf33a..62849a42fe1 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc +++ b/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" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc b/source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc index e76fc82f75a..257d61cd0c4 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc +++ b/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" diff --git a/source/blender/editors/sculpt_paint/grease_pencil_erase.cc b/source/blender/editors/sculpt_paint/grease_pencil_erase.cc index ef92224ced0..ed55437a3fb 100644 --- a/source/blender/editors/sculpt_paint/grease_pencil_erase.cc +++ b/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" diff --git a/source/blender/editors/sculpt_paint/grease_pencil_paint.cc b/source/blender/editors/sculpt_paint/grease_pencil_paint.cc index f18e506f250..2096d3768d6 100644 --- a/source/blender/editors/sculpt_paint/grease_pencil_paint.cc +++ b/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), {}); } } diff --git a/source/blender/editors/sculpt_paint/paint_intern.hh b/source/blender/editors/sculpt_paint/paint_intern.hh index eb9280cc408..0e7ec89710b 100644 --- a/source/blender/editors/sculpt_paint/paint_intern.hh +++ b/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; diff --git a/source/blender/editors/sculpt_paint/paint_vertex.cc b/source/blender/editors/sculpt_paint/paint_vertex.cc index fc903e68daf..0661aaf263a 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.cc +++ b/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" diff --git a/source/blender/editors/sculpt_paint/paint_weight.cc b/source/blender/editors/sculpt_paint/paint_weight.cc index 4422e3dc296..e99fd9947a8 100644 --- a/source/blender/editors/sculpt_paint/paint_weight.cc +++ b/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" diff --git a/source/blender/editors/sculpt_paint/sculpt.cc b/source/blender/editors/sculpt_paint/sculpt.cc index af747148980..7440b84107b 100644 --- a/source/blender/editors/sculpt_paint/sculpt.cc +++ b/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" diff --git a/source/blender/editors/sculpt_paint/sculpt_ops.cc b/source/blender/editors/sculpt_paint/sculpt_ops.cc index 15a5e92fade..3bdcb86ddd5 100644 --- a/source/blender/editors/sculpt_paint/sculpt_ops.cc +++ b/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" diff --git a/source/blender/editors/transform/transform_convert_curves.cc b/source/blender/editors/transform/transform_convert_curves.cc index 854af6b87c8..ce9ccd25790 100644 --- a/source/blender/editors/transform/transform_convert_curves.cc +++ b/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" diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp index 80a9f22e338..4dba8a0cc51 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp +++ b/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" diff --git a/source/blender/geometry/GEO_mesh_copy_selection.hh b/source/blender/geometry/GEO_mesh_copy_selection.hh index 00c8dbce382..2f92bf65e28 100644 --- a/source/blender/geometry/GEO_mesh_copy_selection.hh +++ b/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 class Field; } namespace bke { +enum class AttrDomain : int8_t; class AnonymousAttributePropagationInfo; -} +} // namespace bke } // namespace blender namespace blender::geometry { diff --git a/source/blender/geometry/GEO_mesh_primitive_cylinder_cone.hh b/source/blender/geometry/GEO_mesh_primitive_cylinder_cone.hh index 8dad301bdc0..5afaf96f045 100644 --- a/source/blender/geometry/GEO_mesh_primitive_cylinder_cone.hh +++ b/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; diff --git a/source/blender/geometry/GEO_mesh_split_edges.hh b/source/blender/geometry/GEO_mesh_split_edges.hh index 5204442ef34..6f30d0c2dfa 100644 --- a/source/blender/geometry/GEO_mesh_split_edges.hh +++ b/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 { diff --git a/source/blender/geometry/GEO_point_merge_by_distance.hh b/source/blender/geometry/GEO_point_merge_by_distance.hh index 70b330296cb..8788f788f6b 100644 --- a/source/blender/geometry/GEO_point_merge_by_distance.hh +++ b/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 diff --git a/source/blender/geometry/intern/mesh_primitive_cylinder_cone.cc b/source/blender/geometry/intern/mesh_primitive_cylinder_cone.cc index a70c7541d42..7be82245d75 100644 --- a/source/blender/geometry/intern/mesh_primitive_cylinder_cone.cc +++ b/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" diff --git a/source/blender/gpu/intern/gpu_shader_builder_stubs.cc b/source/blender/gpu/intern/gpu_shader_builder_stubs.cc index a4e274d3032..989f22160c8 100644 --- a/source/blender/gpu/intern/gpu_shader_builder_stubs.cc +++ b/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" diff --git a/source/blender/io/alembic/exporter/abc_writer_mesh.cc b/source/blender/io/alembic/exporter/abc_writer_mesh.cc index 92131ed11a9..ad7a5097f1a 100644 --- a/source/blender/io/alembic/exporter/abc_writer_mesh.cc +++ b/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" diff --git a/source/blender/io/ply/importer/ply_import_mesh.cc b/source/blender/io/ply/importer/ply_import_mesh.cc index 915567ac419..a6cbc20d561 100644 --- a/source/blender/io/ply/importer/ply_import_mesh.cc +++ b/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" diff --git a/source/blender/io/usd/hydra/curves.cc b/source/blender/io/usd/hydra/curves.cc index 2cd6398dac0..3b3ba282398 100644 --- a/source/blender/io/usd/hydra/curves.cc +++ b/source/blender/io/usd/hydra/curves.cc @@ -7,7 +7,7 @@ #include #include -#include "BKE_customdata.hh" +#include "BKE_attribute.hh" #include "BKE_material.h" #include "BKE_curves.hh" diff --git a/source/blender/io/usd/intern/usd_reader_mesh.h b/source/blender/io/usd/intern/usd_reader_mesh.h index 90fde134fe6..0cd5d3002ae 100644 --- a/source/blender/io/usd/intern/usd_reader_mesh.h +++ b/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" diff --git a/source/blender/io/usd/intern/usd_writer_curves.cc b/source/blender/io/usd/intern/usd_writer_curves.cc index d1409584ae7..86c83b31e1f 100644 --- a/source/blender/io/usd/intern/usd_writer_curves.cc +++ b/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" diff --git a/source/blender/io/usd/intern/usd_writer_mesh.cc b/source/blender/io/usd/intern/usd_writer_mesh.cc index 5ef19c6980f..28d680ae45d 100644 --- a/source/blender/io/usd/intern/usd_writer_mesh.cc +++ b/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" diff --git a/source/blender/io/usd/intern/usd_writer_mesh.h b/source/blender/io/usd/intern/usd_writer_mesh.h index e4f401f7532..ec2f1f57ce5 100644 --- a/source/blender/io/usd/intern/usd_writer_mesh.h +++ b/source/blender/io/usd/intern/usd_writer_mesh.h @@ -8,10 +8,13 @@ #include "BLI_map.hh" -#include "BKE_attribute.hh" - #include +namespace blender::bke { +class AttributeIDRef; +struct AttributeMetaData; +} // namespace blender::bke + namespace blender::io::usd { struct USDMeshData; diff --git a/source/blender/makesrna/intern/rna_material.cc b/source/blender/makesrna/intern/rna_material.cc index c5286487f0e..5a095e6f33d 100644 --- a/source/blender/makesrna/intern/rna_material.cc +++ b/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" diff --git a/source/blender/makesrna/intern/rna_mesh.cc b/source/blender/makesrna/intern/rna_mesh.cc index 916d85fca62..a8a963c72f5 100644 --- a/source/blender/makesrna/intern/rna_mesh.cc +++ b/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" diff --git a/source/blender/makesrna/intern/rna_nodetree.cc b/source/blender/makesrna/intern/rna_nodetree.cc index eca31996058..58ab0462d28 100644 --- a/source/blender/makesrna/intern/rna_nodetree.cc +++ b/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" diff --git a/source/blender/nodes/NOD_geometry_nodes_log.hh b/source/blender/nodes/NOD_geometry_nodes_log.hh index d9918efd707..b800663e643 100644 --- a/source/blender/nodes/NOD_geometry_nodes_log.hh +++ b/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"