From b9b47088bc78fbd73618e6873d168a5867c2eee8 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Wed, 20 Dec 2023 19:16:15 -0500 Subject: [PATCH] Cleanup: Remove unnecessary DNA_meshdata_types.h includes Except for vertex groups and a few older color types, these are generally replaced by newer generic attribute types. Also remove some includes of DNA_mesh_types.h, since it's included indirectly by BKE_mesh.hh currently. --- source/blender/blenkernel/BKE_mesh_sample.hh | 1 + .../blenkernel/intern/curve_to_mesh_convert.cc | 3 --- .../blenkernel/intern/geometry_component_mesh.cc | 1 - source/blender/blenkernel/intern/image.cc | 1 - source/blender/blenkernel/intern/material.cc | 2 -- source/blender/blenkernel/intern/mball_tessellate.cc | 2 -- .../blender/blenkernel/intern/mesh_boolean_convert.cc | 2 -- source/blender/blenkernel/intern/mesh_convert.cc | 2 -- source/blender/blenkernel/intern/mesh_fair.cc | 2 -- source/blender/blenkernel/intern/mesh_iterators.cc | 3 --- source/blender/blenkernel/intern/mesh_mapping.cc | 8 +++----- .../blenkernel/intern/mesh_merge_customdata.cc | 3 --- source/blender/blenkernel/intern/mesh_mirror.cc | 1 - source/blender/blenkernel/intern/mesh_normals.cc | 3 --- source/blender/blenkernel/intern/mesh_remap.cc | 3 --- source/blender/blenkernel/intern/mesh_remesh_voxel.cc | 1 - source/blender/blenkernel/intern/mesh_runtime.cc | 1 - source/blender/blenkernel/intern/mesh_sample.cc | 3 --- source/blender/blenkernel/intern/mesh_tangent.cc | 3 --- source/blender/blenkernel/intern/mesh_wrapper.cc | 2 -- source/blender/blenkernel/intern/pbvh.cc | 3 --- source/blender/blenkernel/intern/pbvh_intern.hh | 2 -- source/blender/blenkernel/intern/pbvh_pixels.cc | 2 -- source/blender/blenkernel/intern/pbvh_uv_islands.hh | 2 -- source/blender/blenkernel/intern/rigidbody.cc | 1 - source/blender/blenkernel/intern/shader_fx.cc | 1 - source/blender/blenkernel/intern/subdiv.cc | 1 - source/blender/blenkernel/intern/subdiv_ccg.cc | 3 --- .../blenkernel/intern/subdiv_converter_mesh.cc | 3 --- source/blender/blenkernel/intern/subdiv_deform.cc | 1 - source/blender/blenkernel/intern/subdiv_eval.cc | 3 --- source/blender/blenkernel/intern/subdiv_foreach.cc | 2 -- source/blender/blenkernel/intern/subdiv_mesh.cc | 1 - source/blender/blenkernel/intern/type_conversions.cc | 2 -- source/blender/blenkernel/intern/volume_to_mesh.cc | 2 -- source/blender/blenlib/BLI_astar.h | 2 ++ source/blender/bmesh/intern/bmesh_construct.cc | 1 - source/blender/bmesh/intern/bmesh_core.cc | 2 -- source/blender/bmesh/intern/bmesh_mesh_tessellate.cc | 2 -- source/blender/bmesh/intern/bmesh_polygon.cc | 1 - source/blender/bmesh/intern/bmesh_query_uv.cc | 2 -- source/blender/bmesh/operators/bmo_join_triangles.cc | 2 -- source/blender/bmesh/operators/bmo_mirror.cc | 2 -- source/blender/bmesh/operators/bmo_primitive.cc | 2 -- source/blender/draw/intern/draw_cache_impl_mesh.cc | 1 - source/blender/draw/intern/draw_manager_c.cc | 1 - source/blender/draw/intern/draw_pbvh.cc | 1 - source/blender/editors/mesh/editmesh_utils.cc | 1 - source/blender/editors/mesh/mesh_data.cc | 2 -- source/blender/editors/mesh/mesh_mirror.cc | 2 -- source/blender/editors/object/object_bake.cc | 1 - .../blender/editors/object/object_bake_simulation.cc | 1 - source/blender/editors/object/object_edit.cc | 1 - source/blender/editors/object/object_remesh.cc | 2 -- source/blender/editors/object/object_shapekey.cc | 1 - .../blender/editors/sculpt_paint/curves_sculpt_add.cc | 2 -- .../editors/sculpt_paint/curves_sculpt_comb.cc | 2 -- .../editors/sculpt_paint/curves_sculpt_delete.cc | 2 -- .../editors/sculpt_paint/curves_sculpt_puff.cc | 2 -- .../editors/sculpt_paint/curves_sculpt_slide.cc | 2 -- .../editors/sculpt_paint/curves_sculpt_snake_hook.cc | 2 -- source/blender/editors/sculpt_paint/paint_hide.cc | 2 -- .../blender/editors/sculpt_paint/paint_image_proj.cc | 1 - source/blender/editors/sculpt_paint/paint_mask.cc | 2 -- source/blender/editors/sculpt_paint/paint_utils.cc | 1 - source/blender/editors/sculpt_paint/paint_vertex.cc | 1 + .../editors/sculpt_paint/paint_vertex_color_ops.cc | 1 - source/blender/editors/sculpt_paint/paint_weight.cc | 1 + source/blender/editors/sculpt_paint/sculpt.cc | 2 -- .../editors/sculpt_paint/sculpt_automasking.cc | 2 -- .../blender/editors/sculpt_paint/sculpt_boundary.cc | 1 - source/blender/editors/sculpt_paint/sculpt_dyntopo.cc | 2 -- source/blender/editors/sculpt_paint/sculpt_expand.cc | 2 -- .../blender/editors/sculpt_paint/sculpt_face_set.cc | 2 -- .../editors/sculpt_paint/sculpt_filter_color.cc | 1 - .../editors/sculpt_paint/sculpt_filter_mesh.cc | 3 +-- .../blender/editors/sculpt_paint/sculpt_geodesic.cc | 1 - source/blender/editors/sculpt_paint/sculpt_intern.hh | 1 - .../editors/sculpt_paint/sculpt_multiplane_scrape.cc | 1 - source/blender/editors/sculpt_paint/sculpt_ops.cc | 2 -- .../editors/sculpt_paint/sculpt_paint_color.cc | 2 -- source/blender/editors/sculpt_paint/sculpt_pose.cc | 1 - source/blender/editors/sculpt_paint/sculpt_smooth.cc | 1 - .../blender/editors/sculpt_paint/sculpt_transform.cc | 2 -- source/blender/editors/sculpt_paint/sculpt_undo.cc | 1 - source/blender/editors/sculpt_paint/sculpt_uv.cc | 1 - .../spreadsheet_data_source_geometry.cc | 2 -- source/blender/editors/space_view3d/drawobject.cc | 2 -- .../editors/space_view3d/view3d_gizmo_ruler.cc | 1 - .../blender/editors/space_view3d/view3d_iterators.cc | 2 -- .../editors/transform/transform_convert_mesh.cc | 1 - .../editors/transform/transform_convert_mesh_uv.cc | 2 -- source/blender/editors/uvedit/uvedit_buttons.cc | 1 - source/blender/editors/uvedit/uvedit_ops.cc | 1 - source/blender/editors/uvedit/uvedit_path.cc | 1 - source/blender/editors/uvedit/uvedit_rip.cc | 1 - source/blender/editors/uvedit/uvedit_select.cc | 1 - source/blender/editors/uvedit/uvedit_smart_stitch.cc | 1 - source/blender/editors/uvedit/uvedit_unwrap_ops.cc | 2 -- .../intern/blender_interface/BlenderFileLoader.cpp | 2 ++ .../intern/blender_interface/BlenderFileLoader.h | 1 - source/blender/geometry/GEO_add_curves_on_mesh.hh | 11 ++++------- source/blender/geometry/GEO_mesh_to_volume.hh | 5 ++--- source/blender/geometry/GEO_resample_curves.hh | 1 - source/blender/geometry/GEO_reverse_uv_sampler.hh | 4 +--- source/blender/geometry/intern/add_curves_on_mesh.cc | 1 + .../blender/geometry/intern/mesh_merge_by_distance.cc | 4 +--- .../blender/geometry/intern/mesh_to_curve_convert.cc | 3 --- source/blender/geometry/intern/randomize.cc | 1 - source/blender/geometry/intern/realize_instances.cc | 2 -- source/blender/geometry/intern/uv_pack.cc | 1 - .../intern/MOD_gpencil_legacy_time.cc | 1 - .../intern/lineart/lineart_cpu.cc | 4 +++- .../intern/lineart/lineart_shadow.cc | 2 -- source/blender/io/alembic/exporter/abc_writer_mesh.cc | 1 - source/blender/io/alembic/intern/abc_reader_mesh.cc | 2 -- source/blender/io/collada/ArmatureExporter.cpp | 1 - source/blender/io/collada/DocumentExporter.cpp | 1 - source/blender/io/collada/ImageExporter.cpp | 1 - source/blender/io/collada/MeshImporter.cpp | 2 ++ source/blender/io/collada/MeshImporter.h | 3 ++- source/blender/io/collada/SceneExporter.h | 1 - source/blender/io/stl/importer/stl_import_mesh.cc | 3 --- source/blender/io/usd/intern/usd_reader_mesh.cc | 2 -- source/blender/io/usd/intern/usd_reader_shape.cc | 2 -- source/blender/io/usd/intern/usd_skel_convert.cc | 2 -- source/blender/io/usd/intern/usd_writer_mesh.cc | 2 -- .../wavefront_obj/exporter/obj_export_file_writer.hh | 2 -- .../io/wavefront_obj/exporter/obj_export_mesh.cc | 2 +- .../io/wavefront_obj/exporter/obj_export_mesh.hh | 2 -- .../io/wavefront_obj/importer/obj_import_mesh.cc | 2 +- .../io/wavefront_obj/importer/obj_import_objects.hh | 1 - source/blender/modifiers/intern/MOD_array.cc | 1 - source/blender/modifiers/intern/MOD_remesh.cc | 2 -- source/blender/modifiers/intern/MOD_triangulate.cc | 2 -- .../blender/modifiers/intern/MOD_volume_displace.cc | 2 -- source/blender/modifiers/intern/MOD_volume_to_mesh.cc | 2 -- source/blender/nodes/geometry/node_geometry_util.cc | 2 -- .../nodes/geometry/nodes/node_geo_blur_attribute.cc | 3 --- .../nodes/geometry/nodes/node_geo_convex_hull.cc | 2 -- .../nodes/geometry/nodes/node_geo_curve_fill.cc | 3 --- .../nodes/node_geo_deform_curves_on_surface.cc | 3 --- .../nodes/node_geo_distribute_points_on_faces.cc | 2 -- .../nodes/geometry/nodes/node_geo_dual_mesh.cc | 2 -- .../geometry/nodes/node_geo_duplicate_elements.cc | 2 -- .../nodes/geometry/nodes/node_geo_extrude_mesh.cc | 1 - .../geometry/nodes/node_geo_input_mesh_edge_angle.cc | 4 ---- .../nodes/node_geo_input_mesh_edge_vertices.cc | 3 --- .../geometry/nodes/node_geo_input_mesh_face_area.cc | 3 --- .../nodes/node_geo_input_mesh_face_is_planar.cc | 3 --- .../geometry/nodes/node_geo_input_mesh_island.cc | 3 --- .../nodes/geometry/nodes/node_geo_material_replace.cc | 4 ---- .../geometry/nodes/node_geo_material_selection.cc | 1 - .../nodes/node_geo_mesh_face_group_boundaries.cc | 3 --- .../geometry/nodes/node_geo_mesh_primitive_circle.cc | 3 --- .../geometry/nodes/node_geo_mesh_primitive_cube.cc | 3 --- .../nodes/geometry/nodes/node_geo_mesh_to_volume.cc | 3 --- .../geometry/nodes/node_geo_sample_nearest_surface.cc | 4 ---- .../nodes/geometry/nodes/node_geo_scale_elements.cc | 3 --- .../nodes/geometry/nodes/node_geo_set_material.cc | 2 -- .../nodes/geometry/nodes/node_geo_set_position.cc | 3 --- .../nodes/geometry/nodes/node_geo_uv_pack_islands.cc | 3 --- .../nodes/geometry/nodes/node_geo_uv_unwrap.cc | 3 --- .../nodes/geometry/nodes/node_geo_volume_to_mesh.cc | 3 --- source/blender/render/intern/bake.cc | 3 --- source/blender/render/intern/multires_bake.cc | 2 -- source/blender/render/intern/texture_margin.cc | 3 --- source/blender/render/intern/texture_pointdensity.cc | 1 - source/blender/render/intern/texture_procedural.cc | 1 - 169 files changed, 29 insertions(+), 312 deletions(-) diff --git a/source/blender/blenkernel/BKE_mesh_sample.hh b/source/blender/blenkernel/BKE_mesh_sample.hh index 0976181499b..6ec8e7f88bb 100644 --- a/source/blender/blenkernel/BKE_mesh_sample.hh +++ b/source/blender/blenkernel/BKE_mesh_sample.hh @@ -15,6 +15,7 @@ #include "FN_field.hh" #include "FN_multi_function.hh" +#include "BKE_attribute_math.hh" #include "BKE_geometry_fields.hh" struct Mesh; diff --git a/source/blender/blenkernel/intern/curve_to_mesh_convert.cc b/source/blender/blenkernel/intern/curve_to_mesh_convert.cc index 2ba1bf19df1..297412e5d25 100644 --- a/source/blender/blenkernel/intern/curve_to_mesh_convert.cc +++ b/source/blender/blenkernel/intern/curve_to_mesh_convert.cc @@ -9,9 +9,6 @@ #include "BLI_set.hh" #include "BLI_task.hh" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "BKE_attribute_math.hh" #include "BKE_curves.hh" #include "BKE_geometry_set.hh" diff --git a/source/blender/blenkernel/intern/geometry_component_mesh.cc b/source/blender/blenkernel/intern/geometry_component_mesh.cc index 64c26a50c08..8f0443af53c 100644 --- a/source/blender/blenkernel/intern/geometry_component_mesh.cc +++ b/source/blender/blenkernel/intern/geometry_component_mesh.cc @@ -5,7 +5,6 @@ #include "BLI_listbase.h" #include "BLI_task.hh" -#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" diff --git a/source/blender/blenkernel/intern/image.cc b/source/blender/blenkernel/intern/image.cc index ef779bf7cf8..8c989f39908 100644 --- a/source/blender/blenkernel/intern/image.cc +++ b/source/blender/blenkernel/intern/image.cc @@ -44,7 +44,6 @@ #include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_packedFile_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/blenkernel/intern/material.cc b/source/blender/blenkernel/intern/material.cc index 0f40034b5d7..b0ec1d10919 100644 --- a/source/blender/blenkernel/intern/material.cc +++ b/source/blender/blenkernel/intern/material.cc @@ -27,8 +27,6 @@ #include "DNA_gpencil_legacy_types.h" #include "DNA_grease_pencil_types.h" #include "DNA_material_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_meta_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" diff --git a/source/blender/blenkernel/intern/mball_tessellate.cc b/source/blender/blenkernel/intern/mball_tessellate.cc index 48992efa832..e69463c90da 100644 --- a/source/blender/blenkernel/intern/mball_tessellate.cc +++ b/source/blender/blenkernel/intern/mball_tessellate.cc @@ -15,8 +15,6 @@ #include "MEM_guardedalloc.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_meta_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/blenkernel/intern/mesh_boolean_convert.cc b/source/blender/blenkernel/intern/mesh_boolean_convert.cc index 8f7c34ba706..c0d7fce42b9 100644 --- a/source/blender/blenkernel/intern/mesh_boolean_convert.cc +++ b/source/blender/blenkernel/intern/mesh_boolean_convert.cc @@ -8,8 +8,6 @@ #include -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "BKE_attribute.hh" diff --git a/source/blender/blenkernel/intern/mesh_convert.cc b/source/blender/blenkernel/intern/mesh_convert.cc index 51edfd4f802..abb0ef0acce 100644 --- a/source/blender/blenkernel/intern/mesh_convert.cc +++ b/source/blender/blenkernel/intern/mesh_convert.cc @@ -13,8 +13,6 @@ #include "DNA_curve_types.h" #include "DNA_key_types.h" #include "DNA_material_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_meta_types.h" #include "DNA_object_types.h" #include "DNA_pointcloud_types.h" diff --git a/source/blender/blenkernel/intern/mesh_fair.cc b/source/blender/blenkernel/intern/mesh_fair.cc index fbf8c1cbbf7..6e254f3e8e2 100644 --- a/source/blender/blenkernel/intern/mesh_fair.cc +++ b/source/blender/blenkernel/intern/mesh_fair.cc @@ -13,8 +13,6 @@ #include "BLI_math_vector.h" #include "BLI_vector.hh" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "BKE_lib_id.h" diff --git a/source/blender/blenkernel/intern/mesh_iterators.cc b/source/blender/blenkernel/intern/mesh_iterators.cc index d2159c5b2aa..1c03445a161 100644 --- a/source/blender/blenkernel/intern/mesh_iterators.cc +++ b/source/blender/blenkernel/intern/mesh_iterators.cc @@ -8,9 +8,6 @@ * Functions for iterating mesh features. */ -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "BKE_customdata.hh" #include "BKE_editmesh.hh" #include "BKE_editmesh_cache.hh" diff --git a/source/blender/blenkernel/intern/mesh_mapping.cc b/source/blender/blenkernel/intern/mesh_mapping.cc index 4c585d44ea2..81e0493265f 100644 --- a/source/blender/blenkernel/intern/mesh_mapping.cc +++ b/source/blender/blenkernel/intern/mesh_mapping.cc @@ -13,9 +13,6 @@ #include "atomic_ops.h" -#include "DNA_meshdata_types.h" -#include "DNA_vec_types.h" - #include "BLI_array.hh" #include "BLI_bitmap.h" #include "BLI_buffer.h" @@ -52,7 +49,7 @@ UvVertMap *BKE_mesh_uv_vert_map_create(const blender::OffsetIndices faces, UvMapVert *buf; int i, totuv, nverts; - BLI_buffer_declare_static(vec2f, tf_uv_buf, BLI_BUFFER_NOP, 32); + BLI_buffer_declare_static(blender::float2, tf_uv_buf, BLI_BUFFER_NOP, 32); totuv = 0; @@ -88,7 +85,8 @@ UvVertMap *BKE_mesh_uv_vert_map_create(const blender::OffsetIndices faces, float(*tf_uv)[2] = nullptr; if (use_winding) { - tf_uv = (float(*)[2])BLI_buffer_reinit_data(&tf_uv_buf, vec2f, size_t(face.size())); + tf_uv = (float(*)[2])BLI_buffer_reinit_data( + &tf_uv_buf, blender::float2, size_t(face.size())); } nverts = int(face.size()); diff --git a/source/blender/blenkernel/intern/mesh_merge_customdata.cc b/source/blender/blenkernel/intern/mesh_merge_customdata.cc index 8db1a41493b..25c605b51e5 100644 --- a/source/blender/blenkernel/intern/mesh_merge_customdata.cc +++ b/source/blender/blenkernel/intern/mesh_merge_customdata.cc @@ -8,9 +8,6 @@ #include "MEM_guardedalloc.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "BLI_math_vector_types.hh" #include "BLI_task.hh" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/mesh_mirror.cc b/source/blender/blenkernel/intern/mesh_mirror.cc index f65c771da60..716b59b890e 100644 --- a/source/blender/blenkernel/intern/mesh_mirror.cc +++ b/source/blender/blenkernel/intern/mesh_mirror.cc @@ -11,7 +11,6 @@ #include "BLI_math_matrix.h" #include "BLI_math_vector.h" -#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" diff --git a/source/blender/blenkernel/intern/mesh_normals.cc b/source/blender/blenkernel/intern/mesh_normals.cc index 80e1574105b..1981bac866a 100644 --- a/source/blender/blenkernel/intern/mesh_normals.cc +++ b/source/blender/blenkernel/intern/mesh_normals.cc @@ -17,9 +17,6 @@ #include "BLI_math_geom.h" #include "BLI_math_vector.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "BLI_array_utils.hh" #include "BLI_bit_vector.hh" #include "BLI_linklist.h" diff --git a/source/blender/blenkernel/intern/mesh_remap.cc b/source/blender/blenkernel/intern/mesh_remap.cc index 361a9b1159f..c004263b5e9 100644 --- a/source/blender/blenkernel/intern/mesh_remap.cc +++ b/source/blender/blenkernel/intern/mesh_remap.cc @@ -14,9 +14,6 @@ #include "MEM_guardedalloc.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "BLI_array.hh" #include "BLI_astar.h" #include "BLI_bit_vector.hh" diff --git a/source/blender/blenkernel/intern/mesh_remesh_voxel.cc b/source/blender/blenkernel/intern/mesh_remesh_voxel.cc index d8589061111..fd652c288b5 100644 --- a/source/blender/blenkernel/intern/mesh_remesh_voxel.cc +++ b/source/blender/blenkernel/intern/mesh_remesh_voxel.cc @@ -23,7 +23,6 @@ #include "BLI_span.hh" #include "BLI_task.hh" -#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "BKE_attribute.hh" diff --git a/source/blender/blenkernel/intern/mesh_runtime.cc b/source/blender/blenkernel/intern/mesh_runtime.cc index b72fadbbdab..1313b05885d 100644 --- a/source/blender/blenkernel/intern/mesh_runtime.cc +++ b/source/blender/blenkernel/intern/mesh_runtime.cc @@ -10,7 +10,6 @@ #include "MEM_guardedalloc.h" -#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" diff --git a/source/blender/blenkernel/intern/mesh_sample.cc b/source/blender/blenkernel/intern/mesh_sample.cc index 2edacc60555..3ad42136529 100644 --- a/source/blender/blenkernel/intern/mesh_sample.cc +++ b/source/blender/blenkernel/intern/mesh_sample.cc @@ -8,9 +8,6 @@ #include "BKE_mesh_runtime.hh" #include "BKE_mesh_sample.hh" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "BLI_math_geom.h" #include "BLI_rand.hh" #include "BLI_task.hh" diff --git a/source/blender/blenkernel/intern/mesh_tangent.cc b/source/blender/blenkernel/intern/mesh_tangent.cc index 69aff2eed19..a381f571d96 100644 --- a/source/blender/blenkernel/intern/mesh_tangent.cc +++ b/source/blender/blenkernel/intern/mesh_tangent.cc @@ -12,9 +12,6 @@ #include "MEM_guardedalloc.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "BLI_math_geom.h" #include "BLI_math_vector.h" #include "BLI_string.h" diff --git a/source/blender/blenkernel/intern/mesh_wrapper.cc b/source/blender/blenkernel/intern/mesh_wrapper.cc index 447a0280ff5..103036859ce 100644 --- a/source/blender/blenkernel/intern/mesh_wrapper.cc +++ b/source/blender/blenkernel/intern/mesh_wrapper.cc @@ -22,8 +22,6 @@ #include "MEM_guardedalloc.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_object_types.h" diff --git a/source/blender/blenkernel/intern/pbvh.cc b/source/blender/blenkernel/intern/pbvh.cc index 92748aeeccf..3272b472511 100644 --- a/source/blender/blenkernel/intern/pbvh.cc +++ b/source/blender/blenkernel/intern/pbvh.cc @@ -26,9 +26,6 @@ #include "BLI_vector.hh" #include "BLI_vector_set.hh" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "BKE_attribute.hh" #include "BKE_ccg.h" #include "BKE_mesh.hh" diff --git a/source/blender/blenkernel/intern/pbvh_intern.hh b/source/blender/blenkernel/intern/pbvh_intern.hh index 6948e8e6183..f7d2b998e1c 100644 --- a/source/blender/blenkernel/intern/pbvh_intern.hh +++ b/source/blender/blenkernel/intern/pbvh_intern.hh @@ -11,8 +11,6 @@ #include "BLI_span.hh" #include "BLI_vector.hh" -#include "DNA_meshdata_types.h" - /** \file * \ingroup bke */ diff --git a/source/blender/blenkernel/intern/pbvh_pixels.cc b/source/blender/blenkernel/intern/pbvh_pixels.cc index 305dc4b776d..49cb7aa2f0e 100644 --- a/source/blender/blenkernel/intern/pbvh_pixels.cc +++ b/source/blender/blenkernel/intern/pbvh_pixels.cc @@ -10,8 +10,6 @@ #include "BKE_pbvh_pixels.hh" #include "DNA_image_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "BLI_listbase.h" diff --git a/source/blender/blenkernel/intern/pbvh_uv_islands.hh b/source/blender/blenkernel/intern/pbvh_uv_islands.hh index 9ce3a678b2a..d21ed9829d2 100644 --- a/source/blender/blenkernel/intern/pbvh_uv_islands.hh +++ b/source/blender/blenkernel/intern/pbvh_uv_islands.hh @@ -33,8 +33,6 @@ #include "BLI_vector_list.hh" #include "BLI_virtual_array.hh" -#include "DNA_meshdata_types.h" - namespace blender::bke::pbvh::uv_islands { struct MeshEdge; diff --git a/source/blender/blenkernel/intern/rigidbody.cc b/source/blender/blenkernel/intern/rigidbody.cc index 17e2d605408..97bf9ade451 100644 --- a/source/blender/blenkernel/intern/rigidbody.cc +++ b/source/blender/blenkernel/intern/rigidbody.cc @@ -30,7 +30,6 @@ #include "DNA_ID.h" #include "DNA_collection_types.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_force_types.h" #include "DNA_object_types.h" #include "DNA_rigidbody_types.h" diff --git a/source/blender/blenkernel/intern/shader_fx.cc b/source/blender/blenkernel/intern/shader_fx.cc index 9b059456514..61350446b65 100644 --- a/source/blender/blenkernel/intern/shader_fx.cc +++ b/source/blender/blenkernel/intern/shader_fx.cc @@ -18,7 +18,6 @@ #include "BLT_translation.h" #include "DNA_gpencil_legacy_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" diff --git a/source/blender/blenkernel/intern/subdiv.cc b/source/blender/blenkernel/intern/subdiv.cc index 1647b748521..9cf77debbfb 100644 --- a/source/blender/blenkernel/intern/subdiv.cc +++ b/source/blender/blenkernel/intern/subdiv.cc @@ -9,7 +9,6 @@ #include "BKE_subdiv.hh" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/subdiv_ccg.cc b/source/blender/blenkernel/intern/subdiv_ccg.cc index 295c1a9ddb0..0d3fab20c03 100644 --- a/source/blender/blenkernel/intern/subdiv_ccg.cc +++ b/source/blender/blenkernel/intern/subdiv_ccg.cc @@ -8,9 +8,6 @@ #include "BKE_subdiv_ccg.hh" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "MEM_guardedalloc.h" #include "BLI_enumerable_thread_specific.hh" diff --git a/source/blender/blenkernel/intern/subdiv_converter_mesh.cc b/source/blender/blenkernel/intern/subdiv_converter_mesh.cc index a6c1fd37db9..d1af7c30a58 100644 --- a/source/blender/blenkernel/intern/subdiv_converter_mesh.cc +++ b/source/blender/blenkernel/intern/subdiv_converter_mesh.cc @@ -10,9 +10,6 @@ #include -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "BLI_utildefines.h" #include "BKE_attribute.hh" diff --git a/source/blender/blenkernel/intern/subdiv_deform.cc b/source/blender/blenkernel/intern/subdiv_deform.cc index 5f96dd740f2..dd01ddb8766 100644 --- a/source/blender/blenkernel/intern/subdiv_deform.cc +++ b/source/blender/blenkernel/intern/subdiv_deform.cc @@ -11,7 +11,6 @@ #include #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "BLI_math_vector.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/subdiv_eval.cc b/source/blender/blenkernel/intern/subdiv_eval.cc index b5a2481ef41..e95ec7e18d9 100644 --- a/source/blender/blenkernel/intern/subdiv_eval.cc +++ b/source/blender/blenkernel/intern/subdiv_eval.cc @@ -8,9 +8,6 @@ #include "BKE_subdiv_eval.hh" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "BLI_math_vector.h" #include "BLI_task.h" #include "BLI_timeit.hh" diff --git a/source/blender/blenkernel/intern/subdiv_foreach.cc b/source/blender/blenkernel/intern/subdiv_foreach.cc index 4860d0f492f..b61ca665241 100644 --- a/source/blender/blenkernel/intern/subdiv_foreach.cc +++ b/source/blender/blenkernel/intern/subdiv_foreach.cc @@ -11,8 +11,6 @@ #include "atomic_ops.h" #include "DNA_key_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "BLI_bitmap.h" #include "BLI_task.h" diff --git a/source/blender/blenkernel/intern/subdiv_mesh.cc b/source/blender/blenkernel/intern/subdiv_mesh.cc index b6e3fd01077..a003de5aa7b 100644 --- a/source/blender/blenkernel/intern/subdiv_mesh.cc +++ b/source/blender/blenkernel/intern/subdiv_mesh.cc @@ -12,7 +12,6 @@ #include "DNA_key_types.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "BLI_array.hh" #include "BLI_bitmap.h" diff --git a/source/blender/blenkernel/intern/type_conversions.cc b/source/blender/blenkernel/intern/type_conversions.cc index 788f31bdb92..f42844c62a7 100644 --- a/source/blender/blenkernel/intern/type_conversions.cc +++ b/source/blender/blenkernel/intern/type_conversions.cc @@ -4,8 +4,6 @@ #include "BKE_type_conversions.hh" -#include "DNA_meshdata_types.h" - #include "FN_multi_function_builder.hh" #include "BLI_color.hh" diff --git a/source/blender/blenkernel/intern/volume_to_mesh.cc b/source/blender/blenkernel/intern/volume_to_mesh.cc index 8cb2ff06ca0..4bc83392dd8 100644 --- a/source/blender/blenkernel/intern/volume_to_mesh.cc +++ b/source/blender/blenkernel/intern/volume_to_mesh.cc @@ -8,8 +8,6 @@ #include "BLI_span.hh" #include "BLI_utildefines.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_volume_types.h" #include "BKE_mesh.hh" diff --git a/source/blender/blenlib/BLI_astar.h b/source/blender/blenlib/BLI_astar.h index cb0714507f0..202ac4f3a46 100644 --- a/source/blender/blenlib/BLI_astar.h +++ b/source/blender/blenlib/BLI_astar.h @@ -9,6 +9,8 @@ * \brief An implementation of the A* (AStar) algorithm to solve shortest path problem. */ +#include "DNA_listBase.h" + #include "BLI_utildefines.h" #include "BLI_bitmap.h" diff --git a/source/blender/bmesh/intern/bmesh_construct.cc b/source/blender/bmesh/intern/bmesh_construct.cc index dbdf1150bfe..65582b1e67c 100644 --- a/source/blender/bmesh/intern/bmesh_construct.cc +++ b/source/blender/bmesh/intern/bmesh_construct.cc @@ -18,7 +18,6 @@ #include "BKE_customdata.hh" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "bmesh.hh" #include "intern/bmesh_private.hh" diff --git a/source/blender/bmesh/intern/bmesh_core.cc b/source/blender/bmesh/intern/bmesh_core.cc index bd7ceee0e41..9f5715dee67 100644 --- a/source/blender/bmesh/intern/bmesh_core.cc +++ b/source/blender/bmesh/intern/bmesh_core.cc @@ -18,8 +18,6 @@ #include "BLT_translation.h" -#include "DNA_meshdata_types.h" - #include "BKE_customdata.hh" #include "BKE_mesh.hh" diff --git a/source/blender/bmesh/intern/bmesh_mesh_tessellate.cc b/source/blender/bmesh/intern/bmesh_mesh_tessellate.cc index 6940d472dca..b8494e25d0b 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_tessellate.cc +++ b/source/blender/bmesh/intern/bmesh_mesh_tessellate.cc @@ -11,8 +11,6 @@ * \see mesh_tessellate.cc for the #Mesh equivalent of this file. */ -#include "DNA_meshdata_types.h" - #include "MEM_guardedalloc.h" #include "BLI_alloca.h" diff --git a/source/blender/bmesh/intern/bmesh_polygon.cc b/source/blender/bmesh/intern/bmesh_polygon.cc index 6c48baac509..4a99c1eb614 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.cc +++ b/source/blender/bmesh/intern/bmesh_polygon.cc @@ -10,7 +10,6 @@ */ #include "DNA_listBase.h" -#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/bmesh/intern/bmesh_query_uv.cc b/source/blender/bmesh/intern/bmesh_query_uv.cc index 01340d77f84..7c94997eb7d 100644 --- a/source/blender/bmesh/intern/bmesh_query_uv.cc +++ b/source/blender/bmesh/intern/bmesh_query_uv.cc @@ -18,8 +18,6 @@ #include "BKE_attribute.hh" #include "BKE_customdata.hh" -#include "DNA_meshdata_types.h" - #include "bmesh.hh" #include "intern/bmesh_private.hh" diff --git a/source/blender/bmesh/operators/bmo_join_triangles.cc b/source/blender/bmesh/operators/bmo_join_triangles.cc index 21e8fa6f404..1a3daf7e2a0 100644 --- a/source/blender/bmesh/operators/bmo_join_triangles.cc +++ b/source/blender/bmesh/operators/bmo_join_triangles.cc @@ -13,8 +13,6 @@ #include "MEM_guardedalloc.h" -#include "DNA_meshdata_types.h" - #include "BLI_math_geom.h" #include "BLI_math_rotation.h" #include "BLI_math_vector.h" diff --git a/source/blender/bmesh/operators/bmo_mirror.cc b/source/blender/bmesh/operators/bmo_mirror.cc index 949b43fe2e8..1073315221b 100644 --- a/source/blender/bmesh/operators/bmo_mirror.cc +++ b/source/blender/bmesh/operators/bmo_mirror.cc @@ -10,8 +10,6 @@ #include "MEM_guardedalloc.h" -#include "DNA_meshdata_types.h" - #include "BKE_customdata.hh" #include "bmesh.hh" diff --git a/source/blender/bmesh/operators/bmo_primitive.cc b/source/blender/bmesh/operators/bmo_primitive.cc index 8c24d8f55ce..bf6ab947aa0 100644 --- a/source/blender/bmesh/operators/bmo_primitive.cc +++ b/source/blender/bmesh/operators/bmo_primitive.cc @@ -17,8 +17,6 @@ #include "BKE_customdata.hh" -#include "DNA_meshdata_types.h" - #include "bmesh.hh" #include "intern/bmesh_operators_private.hh" diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.cc b/source/blender/draw/intern/draw_cache_impl_mesh.cc index 70c45e6ed4b..e4cd21e7ed2 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.cc +++ b/source/blender/draw/intern/draw_cache_impl_mesh.cc @@ -26,7 +26,6 @@ #include "BLI_utildefines.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/draw/intern/draw_manager_c.cc b/source/blender/draw/intern/draw_manager_c.cc index 981d0985b14..b9e86a4b9e2 100644 --- a/source/blender/draw/intern/draw_manager_c.cc +++ b/source/blender/draw/intern/draw_manager_c.cc @@ -47,7 +47,6 @@ #include "DNA_camera_types.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_userdef_types.h" #include "DNA_view3d_types.h" #include "DNA_world_types.h" diff --git a/source/blender/draw/intern/draw_pbvh.cc b/source/blender/draw/intern/draw_pbvh.cc index 420db9ba40b..f110c1a3c07 100644 --- a/source/blender/draw/intern/draw_pbvh.cc +++ b/source/blender/draw/intern/draw_pbvh.cc @@ -33,7 +33,6 @@ #include "BLI_vector.hh" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "BKE_DerivedMesh.hh" #include "BKE_attribute.hh" diff --git a/source/blender/editors/mesh/editmesh_utils.cc b/source/blender/editors/mesh/editmesh_utils.cc index daee0b8c55c..3735fb85a5f 100644 --- a/source/blender/editors/mesh/editmesh_utils.cc +++ b/source/blender/editors/mesh/editmesh_utils.cc @@ -10,7 +10,6 @@ #include "DNA_key_types.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "BLI_array.hh" diff --git a/source/blender/editors/mesh/mesh_data.cc b/source/blender/editors/mesh/mesh_data.cc index db667ddacac..a19076e91bd 100644 --- a/source/blender/editors/mesh/mesh_data.cc +++ b/source/blender/editors/mesh/mesh_data.cc @@ -8,8 +8,6 @@ #include "MEM_guardedalloc.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_view3d_types.h" diff --git a/source/blender/editors/mesh/mesh_mirror.cc b/source/blender/editors/mesh/mesh_mirror.cc index 8bec934ad3a..8a494593cec 100644 --- a/source/blender/editors/mesh/mesh_mirror.cc +++ b/source/blender/editors/mesh/mesh_mirror.cc @@ -10,8 +10,6 @@ #include "MEM_guardedalloc.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "BKE_editmesh.hh" diff --git a/source/blender/editors/object/object_bake.cc b/source/blender/editors/object/object_bake.cc index 4687a1a3d34..3b2623d235c 100644 --- a/source/blender/editors/object/object_bake.cc +++ b/source/blender/editors/object/object_bake.cc @@ -12,7 +12,6 @@ #include "DNA_material_types.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" diff --git a/source/blender/editors/object/object_bake_simulation.cc b/source/blender/editors/object/object_bake_simulation.cc index 7cf02459cb5..480a315cf3b 100644 --- a/source/blender/editors/object/object_bake_simulation.cc +++ b/source/blender/editors/object/object_bake_simulation.cc @@ -25,7 +25,6 @@ #include "DNA_curves_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_pointcloud_types.h" #include "DNA_windowmanager_types.h" diff --git a/source/blender/editors/object/object_edit.cc b/source/blender/editors/object/object_edit.cc index 86545c89647..3aeac1ff02f 100644 --- a/source/blender/editors/object/object_edit.cc +++ b/source/blender/editors/object/object_edit.cc @@ -30,7 +30,6 @@ #include "DNA_lattice_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_meta_types.h" #include "DNA_object_force_types.h" #include "DNA_object_types.h" diff --git a/source/blender/editors/object/object_remesh.cc b/source/blender/editors/object/object_remesh.cc index 6911765766c..96f282d1107 100644 --- a/source/blender/editors/object/object_remesh.cc +++ b/source/blender/editors/object/object_remesh.cc @@ -19,8 +19,6 @@ #include "BLI_string_utf8.h" #include "BLI_utildefines.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_userdef_types.h" diff --git a/source/blender/editors/object/object_shapekey.cc b/source/blender/editors/object/object_shapekey.cc index 26e7bef7012..6e769c75be7 100644 --- a/source/blender/editors/object/object_shapekey.cc +++ b/source/blender/editors/object/object_shapekey.cc @@ -26,7 +26,6 @@ #include "DNA_key_types.h" #include "DNA_lattice_types.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "BKE_context.hh" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_add.cc b/source/blender/editors/sculpt_paint/curves_sculpt_add.cc index f3e5acfac2f..65a54ac804a 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_add.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_add.cc @@ -34,8 +34,6 @@ #include "DNA_brush_enums.h" #include "DNA_brush_types.h" #include "DNA_curves_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc b/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc index 2f8c88a968b..23c525ca61b 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc @@ -32,8 +32,6 @@ #include "DNA_brush_enums.h" #include "DNA_brush_types.h" #include "DNA_curves_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_delete.cc b/source/blender/editors/sculpt_paint/curves_sculpt_delete.cc index 0d607dfc7d3..33c5465a78f 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_delete.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_delete.cc @@ -28,8 +28,6 @@ #include "DNA_brush_enums.h" #include "DNA_brush_types.h" #include "DNA_curves_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_puff.cc b/source/blender/editors/sculpt_paint/curves_sculpt_puff.cc index 9914165c076..121b98aa251 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_puff.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_puff.cc @@ -16,8 +16,6 @@ #include "DEG_depsgraph.hh" #include "DNA_brush_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "WM_api.hh" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc b/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc index 3a0213e0890..40f2789c602 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc @@ -25,8 +25,6 @@ #include "DNA_brush_enums.h" #include "DNA_curves_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" 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 257d61cd0c4..200a09ded56 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc @@ -30,8 +30,6 @@ #include "DNA_brush_enums.h" #include "DNA_brush_types.h" #include "DNA_curves_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" diff --git a/source/blender/editors/sculpt_paint/paint_hide.cc b/source/blender/editors/sculpt_paint/paint_hide.cc index 0aaecb3c69e..2f09bf2c3ac 100644 --- a/source/blender/editors/sculpt_paint/paint_hide.cc +++ b/source/blender/editors/sculpt_paint/paint_hide.cc @@ -18,8 +18,6 @@ #include "BLI_utildefines.h" #include "BLI_vector.hh" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.cc b/source/blender/editors/sculpt_paint/paint_image_proj.cc index 561ee5a22f2..1bd8fc2493b 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.cc +++ b/source/blender/editors/sculpt_paint/paint_image_proj.cc @@ -43,7 +43,6 @@ #include "DNA_defs.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_node_types.h" #include "DNA_object_enums.h" #include "DNA_object_types.h" diff --git a/source/blender/editors/sculpt_paint/paint_mask.cc b/source/blender/editors/sculpt_paint/paint_mask.cc index 9b24feeeb86..9d71fffc57f 100644 --- a/source/blender/editors/sculpt_paint/paint_mask.cc +++ b/source/blender/editors/sculpt_paint/paint_mask.cc @@ -10,8 +10,6 @@ #include "MEM_guardedalloc.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_object_types.h" #include "DNA_vec_types.h" diff --git a/source/blender/editors/sculpt_paint/paint_utils.cc b/source/blender/editors/sculpt_paint/paint_utils.cc index 10b8580efdf..ccf1e00c044 100644 --- a/source/blender/editors/sculpt_paint/paint_utils.cc +++ b/source/blender/editors/sculpt_paint/paint_utils.cc @@ -11,7 +11,6 @@ #include "DNA_material_types.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_brush_types.h" diff --git a/source/blender/editors/sculpt_paint/paint_vertex.cc b/source/blender/editors/sculpt_paint/paint_vertex.cc index f1011c6a141..e2c72cedebb 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.cc +++ b/source/blender/editors/sculpt_paint/paint_vertex.cc @@ -28,6 +28,7 @@ #include "DNA_brush_types.h" #include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_particle_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc b/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc index 24675969560..046aead2cac 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc +++ b/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc @@ -9,7 +9,6 @@ #include "MEM_guardedalloc.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/sculpt_paint/paint_weight.cc b/source/blender/editors/sculpt_paint/paint_weight.cc index e25b312597b..79907a8d221 100644 --- a/source/blender/editors/sculpt_paint/paint_weight.cc +++ b/source/blender/editors/sculpt_paint/paint_weight.cc @@ -25,6 +25,7 @@ #include "DNA_brush_types.h" #include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_particle_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/sculpt_paint/sculpt.cc b/source/blender/editors/sculpt_paint/sculpt.cc index 43b18a7ca26..32ebd639ec4 100644 --- a/source/blender/editors/sculpt_paint/sculpt.cc +++ b/source/blender/editors/sculpt_paint/sculpt.cc @@ -31,8 +31,6 @@ #include "DNA_brush_types.h" #include "DNA_customdata_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_automasking.cc b/source/blender/editors/sculpt_paint/sculpt_automasking.cc index 720314174f9..3264a2a7c41 100644 --- a/source/blender/editors/sculpt_paint/sculpt_automasking.cc +++ b/source/blender/editors/sculpt_paint/sculpt_automasking.cc @@ -19,8 +19,6 @@ #include "BLI_vector.hh" #include "DNA_brush_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "BKE_brush.hh" #include "BKE_colortools.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_boundary.cc b/source/blender/editors/sculpt_paint/sculpt_boundary.cc index 4d670849e8b..85d2c9f8786 100644 --- a/source/blender/editors/sculpt_paint/sculpt_boundary.cc +++ b/source/blender/editors/sculpt_paint/sculpt_boundary.cc @@ -11,7 +11,6 @@ #include "BLI_task.h" #include "DNA_brush_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "BKE_brush.hh" diff --git a/source/blender/editors/sculpt_paint/sculpt_dyntopo.cc b/source/blender/editors/sculpt_paint/sculpt_dyntopo.cc index 4b4058a7651..6aac070af46 100644 --- a/source/blender/editors/sculpt_paint/sculpt_dyntopo.cc +++ b/source/blender/editors/sculpt_paint/sculpt_dyntopo.cc @@ -13,8 +13,6 @@ #include "BLT_translation.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "BKE_context.hh" diff --git a/source/blender/editors/sculpt_paint/sculpt_expand.cc b/source/blender/editors/sculpt_paint/sculpt_expand.cc index 4709c2fc9e1..d29f2a39375 100644 --- a/source/blender/editors/sculpt_paint/sculpt_expand.cc +++ b/source/blender/editors/sculpt_paint/sculpt_expand.cc @@ -16,8 +16,6 @@ #include "BLI_task.h" #include "DNA_brush_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_object_types.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_face_set.cc b/source/blender/editors/sculpt_paint/sculpt_face_set.cc index a3fd7193e30..ecad254ce0e 100644 --- a/source/blender/editors/sculpt_paint/sculpt_face_set.cc +++ b/source/blender/editors/sculpt_paint/sculpt_face_set.cc @@ -29,8 +29,6 @@ #include "DNA_brush_types.h" #include "DNA_customdata_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_filter_color.cc b/source/blender/editors/sculpt_paint/sculpt_filter_color.cc index cc153d0b4b9..63d8fcd7b1b 100644 --- a/source/blender/editors/sculpt_paint/sculpt_filter_color.cc +++ b/source/blender/editors/sculpt_paint/sculpt_filter_color.cc @@ -14,7 +14,6 @@ #include "BLT_translation.h" -#include "DNA_meshdata_types.h" #include "DNA_userdef_types.h" #include "BKE_context.hh" diff --git a/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc b/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc index c37f1e19e67..e692cea2b98 100644 --- a/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc +++ b/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc @@ -8,6 +8,7 @@ #include "DNA_modifier_types.h" #include "DNA_windowmanager_types.h" + #include "MEM_guardedalloc.h" #include "BLI_hash.h" @@ -20,8 +21,6 @@ #include "BLT_translation.h" -#include "DNA_meshdata_types.h" - #include "BKE_brush.hh" #include "BKE_context.hh" #include "BKE_modifier.hh" diff --git a/source/blender/editors/sculpt_paint/sculpt_geodesic.cc b/source/blender/editors/sculpt_paint/sculpt_geodesic.cc index 15f1f439fe0..a0b5934736e 100644 --- a/source/blender/editors/sculpt_paint/sculpt_geodesic.cc +++ b/source/blender/editors/sculpt_paint/sculpt_geodesic.cc @@ -18,7 +18,6 @@ #include "DNA_brush_types.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "BKE_ccg.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.hh b/source/blender/editors/sculpt_paint/sculpt_intern.hh index 510c3257270..373049ab4ff 100644 --- a/source/blender/editors/sculpt_paint/sculpt_intern.hh +++ b/source/blender/editors/sculpt_paint/sculpt_intern.hh @@ -13,7 +13,6 @@ #include "DNA_brush_types.h" #include "DNA_key_types.h" #include "DNA_listBase.h" -#include "DNA_meshdata_types.h" #include "DNA_scene_types.h" #include "DNA_vec_types.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.cc b/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.cc index bb6f774c139..3a3d1cf4c46 100644 --- a/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.cc +++ b/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.cc @@ -13,7 +13,6 @@ #include "BLI_task.h" #include "DNA_brush_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #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 3bdcb86ddd5..faa19989425 100644 --- a/source/blender/editors/sculpt_paint/sculpt_ops.cc +++ b/source/blender/editors/sculpt_paint/sculpt_ops.cc @@ -21,8 +21,6 @@ #include "DNA_brush_types.h" #include "DNA_customdata_types.h" #include "DNA_listBase.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_paint_color.cc b/source/blender/editors/sculpt_paint/sculpt_paint_color.cc index 1844b7c1f68..51976de1eed 100644 --- a/source/blender/editors/sculpt_paint/sculpt_paint_color.cc +++ b/source/blender/editors/sculpt_paint/sculpt_paint_color.cc @@ -13,8 +13,6 @@ #include "BLI_task.h" #include "BLI_vector.hh" -#include "DNA_meshdata_types.h" - #include "BKE_brush.hh" #include "BKE_colorband.h" #include "BKE_colortools.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_pose.cc b/source/blender/editors/sculpt_paint/sculpt_pose.cc index 7fdc658806a..7761b8e0b01 100644 --- a/source/blender/editors/sculpt_paint/sculpt_pose.cc +++ b/source/blender/editors/sculpt_paint/sculpt_pose.cc @@ -14,7 +14,6 @@ #include "BLI_task.h" #include "DNA_brush_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "BKE_brush.hh" diff --git a/source/blender/editors/sculpt_paint/sculpt_smooth.cc b/source/blender/editors/sculpt_paint/sculpt_smooth.cc index 7d7401ea0e2..91376b3f4c2 100644 --- a/source/blender/editors/sculpt_paint/sculpt_smooth.cc +++ b/source/blender/editors/sculpt_paint/sculpt_smooth.cc @@ -12,7 +12,6 @@ #include "BLI_task.h" #include "DNA_brush_types.h" -#include "DNA_meshdata_types.h" #include "BKE_context.hh" #include "BKE_paint.hh" diff --git a/source/blender/editors/sculpt_paint/sculpt_transform.cc b/source/blender/editors/sculpt_paint/sculpt_transform.cc index d56c5fa1b12..6ae3bb53797 100644 --- a/source/blender/editors/sculpt_paint/sculpt_transform.cc +++ b/source/blender/editors/sculpt_paint/sculpt_transform.cc @@ -14,8 +14,6 @@ #include "BLI_span.hh" #include "BLI_task.h" -#include "DNA_meshdata_types.h" - #include "BKE_brush.hh" #include "BKE_context.hh" #include "BKE_kelvinlet.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.cc b/source/blender/editors/sculpt_paint/sculpt_undo.cc index ddfc515f16d..9c180007b36 100644 --- a/source/blender/editors/sculpt_paint/sculpt_undo.cc +++ b/source/blender/editors/sculpt_paint/sculpt_undo.cc @@ -41,7 +41,6 @@ #include "BLI_utildefines.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.cc b/source/blender/editors/sculpt_paint/sculpt_uv.cc index bf2ae4f42ef..c0b01551680 100644 --- a/source/blender/editors/sculpt_paint/sculpt_uv.cc +++ b/source/blender/editors/sculpt_paint/sculpt_uv.cc @@ -16,7 +16,6 @@ #include "BLI_utildefines.h" #include "DNA_brush_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc index d068c108f56..ad543c0b639 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc @@ -25,8 +25,6 @@ #include "BKE_volume_grid.hh" #include "DNA_ID.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_pointcloud_types.h" #include "DNA_space_types.h" #include "DNA_userdef_types.h" diff --git a/source/blender/editors/space_view3d/drawobject.cc b/source/blender/editors/space_view3d/drawobject.cc index b4377209407..7e01f88969f 100644 --- a/source/blender/editors/space_view3d/drawobject.cc +++ b/source/blender/editors/space_view3d/drawobject.cc @@ -6,8 +6,6 @@ * \ingroup spview3d */ -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_ruler.cc b/source/blender/editors/space_view3d/view3d_gizmo_ruler.cc index 7a8a2d4ae50..dd874b28d45 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_ruler.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_ruler.cc @@ -29,7 +29,6 @@ #include "BKE_unit.hh" #include "DNA_gpencil_legacy_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_view3d_types.h" diff --git a/source/blender/editors/space_view3d/view3d_iterators.cc b/source/blender/editors/space_view3d/view3d_iterators.cc index bbbf34468b5..74815a64fe0 100644 --- a/source/blender/editors/space_view3d/view3d_iterators.cc +++ b/source/blender/editors/space_view3d/view3d_iterators.cc @@ -9,8 +9,6 @@ #include "DNA_armature_types.h" #include "DNA_curve_types.h" #include "DNA_lattice_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_meta_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/transform/transform_convert_mesh.cc b/source/blender/editors/transform/transform_convert_mesh.cc index 2a62d231782..c3821e124a7 100644 --- a/source/blender/editors/transform/transform_convert_mesh.cc +++ b/source/blender/editors/transform/transform_convert_mesh.cc @@ -7,7 +7,6 @@ */ #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/transform/transform_convert_mesh_uv.cc b/source/blender/editors/transform/transform_convert_mesh_uv.cc index 87a227fc7d4..c9902dcc152 100644 --- a/source/blender/editors/transform/transform_convert_mesh_uv.cc +++ b/source/blender/editors/transform/transform_convert_mesh_uv.cc @@ -6,8 +6,6 @@ * \ingroup edtransform */ -#include "DNA_meshdata_types.h" - #include "MEM_guardedalloc.h" #include "BLI_bitmap.h" diff --git a/source/blender/editors/uvedit/uvedit_buttons.cc b/source/blender/editors/uvedit/uvedit_buttons.cc index 37b92de142a..e4ccd61c143 100644 --- a/source/blender/editors/uvedit/uvedit_buttons.cc +++ b/source/blender/editors/uvedit/uvedit_buttons.cc @@ -11,7 +11,6 @@ #include "MEM_guardedalloc.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" diff --git a/source/blender/editors/uvedit/uvedit_ops.cc b/source/blender/editors/uvedit/uvedit_ops.cc index 94fea0671cc..3c10789f052 100644 --- a/source/blender/editors/uvedit/uvedit_ops.cc +++ b/source/blender/editors/uvedit/uvedit_ops.cc @@ -15,7 +15,6 @@ #include "DNA_image_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/uvedit/uvedit_path.cc b/source/blender/editors/uvedit/uvedit_path.cc index 9a7bbdee7da..fb866d6cb34 100644 --- a/source/blender/editors/uvedit/uvedit_path.cc +++ b/source/blender/editors/uvedit/uvedit_path.cc @@ -23,7 +23,6 @@ #include "DNA_image_types.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/uvedit/uvedit_rip.cc b/source/blender/editors/uvedit/uvedit_rip.cc index 8d6c8c28825..200cd52fe74 100644 --- a/source/blender/editors/uvedit/uvedit_rip.cc +++ b/source/blender/editors/uvedit/uvedit_rip.cc @@ -19,7 +19,6 @@ #include "DNA_image_types.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/uvedit/uvedit_select.cc b/source/blender/editors/uvedit/uvedit_select.cc index 4b42e09df45..94af21b03a0 100644 --- a/source/blender/editors/uvedit/uvedit_select.cc +++ b/source/blender/editors/uvedit/uvedit_select.cc @@ -14,7 +14,6 @@ #include "DNA_image_types.h" #include "DNA_material_types.h" -#include "DNA_meshdata_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.cc b/source/blender/editors/uvedit/uvedit_smart_stitch.cc index 943efaf3552..28b16e103b3 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.cc +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.cc @@ -12,7 +12,6 @@ #include "MEM_guardedalloc.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_windowmanager_types.h" diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.cc b/source/blender/editors/uvedit/uvedit_unwrap_ops.cc index d248bbebef3..a2b3046e2dc 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.cc +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.cc @@ -13,8 +13,6 @@ #include "MEM_guardedalloc.h" #include "DNA_camera_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp index db2c2fa27dc..8442855bdc5 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp @@ -8,6 +8,8 @@ #include "BlenderFileLoader.h" +#include "DNA_meshdata_types.h" + #include "BLI_math_geom.h" #include "BLI_math_matrix.h" #include "BLI_math_vector.h" diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h index eb4dcba10b5..7d86532f0e3 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h @@ -26,7 +26,6 @@ #include "DNA_material_types.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/geometry/GEO_add_curves_on_mesh.hh b/source/blender/geometry/GEO_add_curves_on_mesh.hh index 05667a974ec..f5b0f188813 100644 --- a/source/blender/geometry/GEO_add_curves_on_mesh.hh +++ b/source/blender/geometry/GEO_add_curves_on_mesh.hh @@ -4,19 +4,16 @@ #pragma once -#include "BLI_kdtree.h" -#include "BLI_math_matrix_types.hh" -#include "BLI_math_vector.hh" +#include "BLI_math_vector_types.hh" #include "BLI_span.hh" -#include "BKE_bvhutils.hh" #include "BKE_curves.hh" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "GEO_reverse_uv_sampler.hh" +struct Mesh; +struct KDTree_3d; + namespace blender::geometry { struct AddCurvesOnMeshInputs { diff --git a/source/blender/geometry/GEO_mesh_to_volume.hh b/source/blender/geometry/GEO_mesh_to_volume.hh index c35a88e0924..cd0298c8b6b 100644 --- a/source/blender/geometry/GEO_mesh_to_volume.hh +++ b/source/blender/geometry/GEO_mesh_to_volume.hh @@ -7,16 +7,15 @@ #include "BLI_math_matrix_types.hh" #include "BLI_string_ref.hh" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "BKE_volume_grid_fwd.hh" #pragma once -struct Volume; struct Depsgraph; +struct Mesh; +struct Volume; /** \file * \ingroup geo diff --git a/source/blender/geometry/GEO_resample_curves.hh b/source/blender/geometry/GEO_resample_curves.hh index 7918bce188f..dab10c75a06 100644 --- a/source/blender/geometry/GEO_resample_curves.hh +++ b/source/blender/geometry/GEO_resample_curves.hh @@ -6,7 +6,6 @@ #include "FN_field.hh" -#include "BKE_anonymous_attribute_id.hh" #include "BKE_attribute.hh" #include "BKE_curves.hh" diff --git a/source/blender/geometry/GEO_reverse_uv_sampler.hh b/source/blender/geometry/GEO_reverse_uv_sampler.hh index ee8c0f51dab..b7d80357a93 100644 --- a/source/blender/geometry/GEO_reverse_uv_sampler.hh +++ b/source/blender/geometry/GEO_reverse_uv_sampler.hh @@ -6,12 +6,10 @@ #include -#include "BLI_math_vector.hh" +#include "BLI_math_vector_types.hh" #include "BLI_multi_value_map.hh" #include "BLI_span.hh" -#include "DNA_meshdata_types.h" - namespace blender::geometry { /** diff --git a/source/blender/geometry/intern/add_curves_on_mesh.cc b/source/blender/geometry/intern/add_curves_on_mesh.cc index 203ff4e5244..10aa63c4812 100644 --- a/source/blender/geometry/intern/add_curves_on_mesh.cc +++ b/source/blender/geometry/intern/add_curves_on_mesh.cc @@ -4,6 +4,7 @@ #include "BLI_math_vector.hh" +#include "BLI_kdtree.h" #include "BLI_length_parameterize.hh" #include "BLI_math_matrix.h" #include "BLI_math_matrix.hh" diff --git a/source/blender/geometry/intern/mesh_merge_by_distance.cc b/source/blender/geometry/intern/mesh_merge_by_distance.cc index 6ef6e5f36cb..87e72c05837 100644 --- a/source/blender/geometry/intern/mesh_merge_by_distance.cc +++ b/source/blender/geometry/intern/mesh_merge_by_distance.cc @@ -14,11 +14,9 @@ #include "BLI_offset_indices.hh" #include "BLI_vector.hh" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "BKE_customdata.hh" #include "BKE_mesh.hh" +#include "DNA_meshdata_types.h" #include "GEO_mesh_merge_by_distance.hh" #include "GEO_randomize.hh" diff --git a/source/blender/geometry/intern/mesh_to_curve_convert.cc b/source/blender/geometry/intern/mesh_to_curve_convert.cc index fb92c44e62f..b0bf1beb047 100644 --- a/source/blender/geometry/intern/mesh_to_curve_convert.cc +++ b/source/blender/geometry/intern/mesh_to_curve_convert.cc @@ -7,9 +7,6 @@ #include "BLI_set.hh" #include "BLI_task.hh" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "BKE_attribute.hh" #include "BKE_attribute_math.hh" #include "BKE_curves.hh" diff --git a/source/blender/geometry/intern/randomize.cc b/source/blender/geometry/intern/randomize.cc index d3b65feb3f2..f61c5af74bc 100644 --- a/source/blender/geometry/intern/randomize.cc +++ b/source/blender/geometry/intern/randomize.cc @@ -10,7 +10,6 @@ #include "DNA_curves_types.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_pointcloud_types.h" #include "BKE_attribute.hh" diff --git a/source/blender/geometry/intern/realize_instances.cc b/source/blender/geometry/intern/realize_instances.cc index 4cbaa1b40f4..fcae8d7ebf4 100644 --- a/source/blender/geometry/intern/realize_instances.cc +++ b/source/blender/geometry/intern/realize_instances.cc @@ -6,8 +6,6 @@ #include "DNA_collection_types.h" #include "DNA_layer_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_pointcloud_types.h" diff --git a/source/blender/geometry/intern/uv_pack.cc b/source/blender/geometry/intern/uv_pack.cc index d5c1e59a0c8..05bfa18dab0 100644 --- a/source/blender/geometry/intern/uv_pack.cc +++ b/source/blender/geometry/intern/uv_pack.cc @@ -24,7 +24,6 @@ #include "BLI_rect.h" #include "BLI_vector.hh" -#include "DNA_meshdata_types.h" #include "DNA_scene_types.h" #include "DNA_space_types.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_time.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_time.cc index 68dafb9bddc..cc7183e9359 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_time.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_time.cc @@ -22,7 +22,6 @@ #include "DNA_defaults.h" #include "DNA_gpencil_legacy_types.h" #include "DNA_gpencil_modifier_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_cpu.cc b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_cpu.cc index 4a5cf740ca0..a820a8a242c 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_cpu.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_cpu.cc @@ -40,16 +40,18 @@ #include "BKE_object.hh" #include "BKE_pointcache.h" #include "BKE_scene.h" + #include "DEG_depsgraph_query.hh" + #include "DNA_camera_types.h" #include "DNA_collection_types.h" #include "DNA_gpencil_legacy_types.h" #include "DNA_light_types.h" #include "DNA_material_types.h" -#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_scene_types.h" + #include "MEM_guardedalloc.h" #include "RE_pipeline.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_shadow.cc b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_shadow.cc index 46cf8a79746..6473afd6690 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_shadow.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_shadow.cc @@ -27,8 +27,6 @@ #include "DNA_gpencil_legacy_types.h" #include "DNA_light_types.h" #include "DNA_material_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/io/alembic/exporter/abc_writer_mesh.cc b/source/blender/io/alembic/exporter/abc_writer_mesh.cc index 367b400244a..071ea94152d 100644 --- a/source/blender/io/alembic/exporter/abc_writer_mesh.cc +++ b/source/blender/io/alembic/exporter/abc_writer_mesh.cc @@ -29,7 +29,6 @@ #include "DNA_layer_types.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_object_fluidsim_types.h" #include "DNA_particle_types.h" diff --git a/source/blender/io/alembic/intern/abc_reader_mesh.cc b/source/blender/io/alembic/intern/abc_reader_mesh.cc index 1944cb21305..984187015ab 100644 --- a/source/blender/io/alembic/intern/abc_reader_mesh.cc +++ b/source/blender/io/alembic/intern/abc_reader_mesh.cc @@ -17,8 +17,6 @@ #include "DNA_customdata_types.h" #include "DNA_material_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "BLI_compiler_compat.h" diff --git a/source/blender/io/collada/ArmatureExporter.cpp b/source/blender/io/collada/ArmatureExporter.cpp index 713b3ce7d26..815f34bb55b 100644 --- a/source/blender/io/collada/ArmatureExporter.cpp +++ b/source/blender/io/collada/ArmatureExporter.cpp @@ -12,7 +12,6 @@ #include "COLLADASWSource.h" #include "DNA_action_types.h" -#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "BKE_action.h" diff --git a/source/blender/io/collada/DocumentExporter.cpp b/source/blender/io/collada/DocumentExporter.cpp index b7678ff7b56..3409a95f513 100644 --- a/source/blender/io/collada/DocumentExporter.cpp +++ b/source/blender/io/collada/DocumentExporter.cpp @@ -54,7 +54,6 @@ #include "DNA_image_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/io/collada/ImageExporter.cpp b/source/blender/io/collada/ImageExporter.cpp index bfb6a93e868..8fc63dcad63 100644 --- a/source/blender/io/collada/ImageExporter.cpp +++ b/source/blender/io/collada/ImageExporter.cpp @@ -10,7 +10,6 @@ #include "COLLADASWImage.h" #include "DNA_image_types.h" -#include "DNA_meshdata_types.h" #include "DNA_texture_types.h" #include "BKE_customdata.hh" diff --git a/source/blender/io/collada/MeshImporter.cpp b/source/blender/io/collada/MeshImporter.cpp index 56117b4dd29..ce230fa409f 100644 --- a/source/blender/io/collada/MeshImporter.cpp +++ b/source/blender/io/collada/MeshImporter.cpp @@ -27,6 +27,8 @@ #include "BKE_mesh.hh" #include "BKE_object.hh" +#include "DNA_meshdata_types.h" + #include "BLI_listbase.h" #include "BLI_string.h" diff --git a/source/blender/io/collada/MeshImporter.h b/source/blender/io/collada/MeshImporter.h index 85414a9d1cc..04d553e7cd8 100644 --- a/source/blender/io/collada/MeshImporter.h +++ b/source/blender/io/collada/MeshImporter.h @@ -29,10 +29,11 @@ #include "DNA_material_types.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" +struct MLoopCol; + /* only for ArmatureImporter to "see" MeshImporter::get_object_by_geom_uid */ class MeshImporterBase { public: diff --git a/source/blender/io/collada/SceneExporter.h b/source/blender/io/collada/SceneExporter.h index a920cdcb0ac..74ebdc48c90 100644 --- a/source/blender/io/collada/SceneExporter.h +++ b/source/blender/io/collada/SceneExporter.h @@ -21,7 +21,6 @@ #include "DNA_image_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/io/stl/importer/stl_import_mesh.cc b/source/blender/io/stl/importer/stl_import_mesh.cc index 579f670dd7f..d00db91086c 100644 --- a/source/blender/io/stl/importer/stl_import_mesh.cc +++ b/source/blender/io/stl/importer/stl_import_mesh.cc @@ -19,9 +19,6 @@ #include "BLI_math_vector.hh" #include "BLI_task.hh" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "stl_import_mesh.hh" namespace blender::io::stl { diff --git a/source/blender/io/usd/intern/usd_reader_mesh.cc b/source/blender/io/usd/intern/usd_reader_mesh.cc index c5d81a6d240..bbb2e565889 100644 --- a/source/blender/io/usd/intern/usd_reader_mesh.cc +++ b/source/blender/io/usd/intern/usd_reader_mesh.cc @@ -27,8 +27,6 @@ #include "DNA_customdata_types.h" #include "DNA_material_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_object_types.h" #include "DNA_windowmanager_types.h" diff --git a/source/blender/io/usd/intern/usd_reader_shape.cc b/source/blender/io/usd/intern/usd_reader_shape.cc index a6ce087c615..79bcc255271 100644 --- a/source/blender/io/usd/intern/usd_reader_shape.cc +++ b/source/blender/io/usd/intern/usd_reader_shape.cc @@ -9,8 +9,6 @@ #include "BKE_report.h" #include "DNA_cachefile_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_windowmanager_types.h" diff --git a/source/blender/io/usd/intern/usd_skel_convert.cc b/source/blender/io/usd/intern/usd_skel_convert.cc index 3a39fb1b3b0..46161d322c6 100644 --- a/source/blender/io/usd/intern/usd_skel_convert.cc +++ b/source/blender/io/usd/intern/usd_skel_convert.cc @@ -16,8 +16,6 @@ #include "DNA_anim_types.h" #include "DNA_armature_types.h" #include "DNA_key_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_meta_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/io/usd/intern/usd_writer_mesh.cc b/source/blender/io/usd/intern/usd_writer_mesh.cc index 5701f5b3132..e6641c0f2e2 100644 --- a/source/blender/io/usd/intern/usd_writer_mesh.cc +++ b/source/blender/io/usd/intern/usd_writer_mesh.cc @@ -30,8 +30,6 @@ #include "DEG_depsgraph.hh" #include "DNA_layer_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_object_fluidsim_types.h" #include "DNA_particle_types.h" diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.hh b/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.hh index 5e5c9c73c8e..ede2b4a996a 100644 --- a/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.hh +++ b/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.hh @@ -8,8 +8,6 @@ #pragma once -#include "DNA_meshdata_types.h" - #include "BLI_map.hh" #include "BLI_set.hh" #include "BLI_vector.hh" diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc index be970bd5859..1fefc7cc421 100644 --- a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc +++ b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc @@ -25,7 +25,7 @@ #include "DEG_depsgraph_query.hh" #include "DNA_material_types.h" -#include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_object_types.h" diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.hh b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.hh index 26289e56d5b..4eca64e3a9e 100644 --- a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.hh +++ b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.hh @@ -17,8 +17,6 @@ #include "BLI_virtual_array.hh" #include "DNA_material_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "IO_wavefront_obj.hh" diff --git a/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc b/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc index c8ac01ef6c3..5290c4c232c 100644 --- a/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc +++ b/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc @@ -9,7 +9,7 @@ #include #include "DNA_material_types.h" -#include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" #include "DNA_scene_types.h" #include "BKE_attribute.hh" diff --git a/source/blender/io/wavefront_obj/importer/obj_import_objects.hh b/source/blender/io/wavefront_obj/importer/obj_import_objects.hh index d6cd6393557..2c2ae68f152 100644 --- a/source/blender/io/wavefront_obj/importer/obj_import_objects.hh +++ b/source/blender/io/wavefront_obj/importer/obj_import_objects.hh @@ -16,7 +16,6 @@ #include "BLI_set.hh" #include "BLI_vector.hh" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" namespace blender::io::obj { diff --git a/source/blender/modifiers/intern/MOD_array.cc b/source/blender/modifiers/intern/MOD_array.cc index c9685891e13..5bf571b4a26 100644 --- a/source/blender/modifiers/intern/MOD_array.cc +++ b/source/blender/modifiers/intern/MOD_array.cc @@ -20,7 +20,6 @@ #include "DNA_curve_types.h" #include "DNA_defaults.h" -#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/modifiers/intern/MOD_remesh.cc b/source/blender/modifiers/intern/MOD_remesh.cc index 80f471c3e1e..7d50107a26a 100644 --- a/source/blender/modifiers/intern/MOD_remesh.cc +++ b/source/blender/modifiers/intern/MOD_remesh.cc @@ -15,8 +15,6 @@ #include "BLT_translation.h" #include "DNA_defaults.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_object_types.h" #include "DNA_screen_types.h" diff --git a/source/blender/modifiers/intern/MOD_triangulate.cc b/source/blender/modifiers/intern/MOD_triangulate.cc index 43ceb016a26..d7077735b02 100644 --- a/source/blender/modifiers/intern/MOD_triangulate.cc +++ b/source/blender/modifiers/intern/MOD_triangulate.cc @@ -15,8 +15,6 @@ #include "BLT_translation.h" #include "DNA_defaults.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_screen_types.h" diff --git a/source/blender/modifiers/intern/MOD_volume_displace.cc b/source/blender/modifiers/intern/MOD_volume_displace.cc index 9ea43da60ca..dc4e9f814aa 100644 --- a/source/blender/modifiers/intern/MOD_volume_displace.cc +++ b/source/blender/modifiers/intern/MOD_volume_displace.cc @@ -18,8 +18,6 @@ #include "BLT_translation.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_screen_types.h" #include "DNA_texture_types.h" diff --git a/source/blender/modifiers/intern/MOD_volume_to_mesh.cc b/source/blender/modifiers/intern/MOD_volume_to_mesh.cc index 7c9ddc428be..0a81e15f067 100644 --- a/source/blender/modifiers/intern/MOD_volume_to_mesh.cc +++ b/source/blender/modifiers/intern/MOD_volume_to_mesh.cc @@ -20,8 +20,6 @@ #include "MOD_modifiertypes.hh" #include "MOD_ui_common.hh" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_object_types.h" #include "DNA_screen_types.h" diff --git a/source/blender/nodes/geometry/node_geometry_util.cc b/source/blender/nodes/geometry/node_geometry_util.cc index 2cec1fbf40a..b259a51e0d4 100644 --- a/source/blender/nodes/geometry/node_geometry_util.cc +++ b/source/blender/nodes/geometry/node_geometry_util.cc @@ -5,8 +5,6 @@ #include "node_geometry_util.hh" #include "node_util.hh" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_space_types.h" #include "BKE_context.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_blur_attribute.cc b/source/blender/nodes/geometry/nodes/node_geo_blur_attribute.cc index b807728a3b2..b6ef2b3318f 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_blur_attribute.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_blur_attribute.cc @@ -11,9 +11,6 @@ #include "BLI_vector.hh" #include "BLI_virtual_array.hh" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "BKE_attribute_math.hh" #include "BKE_curves.hh" #include "BKE_geometry_fields.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc b/source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc index aea8356e9ad..e3ff9421cf6 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc @@ -2,8 +2,6 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_pointcloud_types.h" #include "BKE_curves.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc index a5704b3b935..a4547b19df5 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc @@ -6,9 +6,6 @@ #include "BLI_delaunay_2d.hh" #include "BLI_math_vector_types.hh" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "BKE_curves.hh" #include "BKE_grease_pencil.hh" #include "BKE_instances.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_deform_curves_on_surface.cc b/source/blender/nodes/geometry/nodes/node_geo_deform_curves_on_surface.cc index 6d205f9171c..a94505bdfae 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_deform_curves_on_surface.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_deform_curves_on_surface.cc @@ -18,9 +18,6 @@ #include "UI_interface.hh" #include "UI_resources.hh" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "NOD_socket_search_link.hh" #include "GEO_reverse_uv_sampler.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc index f36259a702b..19ff253e50f 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc @@ -11,8 +11,6 @@ #include "BLI_task.hh" #include "BLI_timeit.hh" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_pointcloud_types.h" #include "BKE_attribute_math.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_dual_mesh.cc b/source/blender/nodes/geometry/nodes/node_geo_dual_mesh.cc index e87e036afc2..3f9a421c8ad 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_dual_mesh.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_dual_mesh.cc @@ -5,8 +5,6 @@ #include "BLI_array_utils.hh" #include "BLI_task.hh" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "BKE_attribute_math.hh" #include "BKE_mesh.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc b/source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc index 1afe4bf74a3..713a3a6c4d7 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc @@ -9,8 +9,6 @@ #include "BLI_span.hh" #include "BLI_task.hh" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_pointcloud_types.h" #include "BKE_attribute_math.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc b/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc index d3b79448124..4ffce89bbb1 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc @@ -8,7 +8,6 @@ #include "BLI_vector_set.hh" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "BKE_attribute_math.hh" #include "BKE_mesh.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_angle.cc b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_angle.cc index 2a8b53d0511..dd77f2606fc 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_angle.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_angle.cc @@ -2,12 +2,8 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "BLI_math_matrix.hh" #include "BLI_math_vector.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "BKE_mesh.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_vertices.cc b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_vertices.cc index 6225fb1331d..04481eab907 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_vertices.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_edge_vertices.cc @@ -2,9 +2,6 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "BKE_mesh.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_area.cc b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_area.cc index ed7d31475fb..3a061266703 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_area.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_area.cc @@ -2,9 +2,6 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "BKE_mesh.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_is_planar.cc b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_is_planar.cc index 4a7f1ee544f..4be52cf950e 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_is_planar.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_face_is_planar.cc @@ -4,9 +4,6 @@ #include "BLI_math_vector.hh" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "BKE_mesh.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_island.cc b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_island.cc index 8ff8a3c379b..bfd53962a03 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_mesh_island.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_mesh_island.cc @@ -2,9 +2,6 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "BKE_mesh.hh" #include "BLI_atomic_disjoint_set.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_material_replace.cc b/source/blender/nodes/geometry/nodes/node_geo_material_replace.cc index ad238c4110e..d95e76151a4 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_material_replace.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_material_replace.cc @@ -4,11 +4,7 @@ #include "node_geometry_util.hh" -#include "UI_interface.hh" -#include "UI_resources.hh" - #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "BKE_grease_pencil.hh" #include "BKE_material.h" diff --git a/source/blender/nodes/geometry/nodes/node_geo_material_selection.cc b/source/blender/nodes/geometry/nodes/node_geo_material_selection.cc index 3c07c521320..88ead0b3cac 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_material_selection.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_material_selection.cc @@ -8,7 +8,6 @@ #include "UI_resources.hh" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "BLI_task.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_face_group_boundaries.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_face_group_boundaries.cc index 11fe98d6fc5..c69d3c29569 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_face_group_boundaries.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_face_group_boundaries.cc @@ -4,9 +4,6 @@ #include -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "BKE_mesh.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc index 694dfb6c8a0..284f93a0d58 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc @@ -2,9 +2,6 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "BKE_material.h" #include "BKE_mesh.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cube.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cube.cc index 123b4cc41a1..b6cac1a8796 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cube.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cube.cc @@ -4,9 +4,6 @@ #include "BLI_math_euler.hh" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "BKE_material.h" #include "BKE_mesh.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc index cbe4f0c66d8..6dedaeb6e10 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc @@ -14,9 +14,6 @@ #include "GEO_mesh_to_volume.hh" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "NOD_rna_define.hh" #include "UI_interface.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc b/source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc index ac494ffb08a..805efb40ff2 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc @@ -2,10 +2,6 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - -#include "BKE_attribute_math.hh" #include "BKE_bvhutils.hh" #include "BKE_mesh.hh" #include "BKE_mesh_sample.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_scale_elements.cc b/source/blender/nodes/geometry/nodes/node_geo_scale_elements.cc index 836fae4ed9e..23508d5c72d 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_scale_elements.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_scale_elements.cc @@ -9,9 +9,6 @@ #include "BLI_vector.hh" #include "BLI_vector_set.hh" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_set_material.cc b/source/blender/nodes/geometry/nodes/node_geo_set_material.cc index fcf4418b980..a840cfa181f 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_set_material.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_set_material.cc @@ -8,8 +8,6 @@ #include "UI_resources.hh" #include "DNA_curves_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_pointcloud_types.h" #include "DNA_volume_types.h" diff --git a/source/blender/nodes/geometry/nodes/node_geo_set_position.cc b/source/blender/nodes/geometry/nodes/node_geo_set_position.cc index 97f9385a0f7..82c352ad001 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_set_position.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_set_position.cc @@ -6,9 +6,6 @@ #include "BLI_task.hh" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "BKE_curves.hh" #include "BKE_grease_pencil.hh" #include "BKE_mesh.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_uv_pack_islands.cc b/source/blender/nodes/geometry/nodes/node_geo_uv_pack_islands.cc index 3361cdcf098..56c784cbe79 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_uv_pack_islands.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_uv_pack_islands.cc @@ -4,9 +4,6 @@ #include "GEO_uv_parametrizer.hh" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "BKE_mesh.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc b/source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc index ed20fe03563..83d5c0288ef 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc @@ -4,9 +4,6 @@ #include "GEO_uv_parametrizer.hh" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "BKE_mesh.hh" #include "UI_interface.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc b/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc index 0ded1d526c9..8850374efcc 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc @@ -18,9 +18,6 @@ #include "BKE_volume_grid.hh" #include "BKE_volume_to_mesh.hh" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "NOD_rna_define.hh" #include "UI_interface.hh" diff --git a/source/blender/render/intern/bake.cc b/source/blender/render/intern/bake.cc index f68b750849b..d179ae85bff 100644 --- a/source/blender/render/intern/bake.cc +++ b/source/blender/render/intern/bake.cc @@ -53,9 +53,6 @@ #include "MEM_guardedalloc.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "BLI_math_geom.h" #include "BLI_math_matrix.h" #include "BLI_math_vector.h" diff --git a/source/blender/render/intern/multires_bake.cc b/source/blender/render/intern/multires_bake.cc index 69ee1a67f89..6a155128e4a 100644 --- a/source/blender/render/intern/multires_bake.cc +++ b/source/blender/render/intern/multires_bake.cc @@ -10,8 +10,6 @@ #include "MEM_guardedalloc.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/render/intern/texture_margin.cc b/source/blender/render/intern/texture_margin.cc index 339da52cc41..3c7bcb543b5 100644 --- a/source/blender/render/intern/texture_margin.cc +++ b/source/blender/render/intern/texture_margin.cc @@ -18,9 +18,6 @@ #include "BKE_mesh.hh" #include "BKE_mesh_mapping.hh" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/render/intern/texture_pointdensity.cc b/source/blender/render/intern/texture_pointdensity.cc index bf3b91e4312..45911fa2552 100644 --- a/source/blender/render/intern/texture_pointdensity.cc +++ b/source/blender/render/intern/texture_pointdensity.cc @@ -23,7 +23,6 @@ #include "BLT_translation.h" -#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_particle_types.h" diff --git a/source/blender/render/intern/texture_procedural.cc b/source/blender/render/intern/texture_procedural.cc index 6ca7d1c2768..d52827f5433 100644 --- a/source/blender/render/intern/texture_procedural.cc +++ b/source/blender/render/intern/texture_procedural.cc @@ -20,7 +20,6 @@ #include "DNA_image_types.h" #include "DNA_light_types.h" #include "DNA_material_types.h" -#include "DNA_meshdata_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" #include "DNA_texture_types.h"