From 4de536c1141cb874ecce78903c92eaac32ddcc04 Mon Sep 17 00:00:00 2001 From: Jesse Yurkovich Date: Fri, 11 Jul 2025 05:01:57 +0200 Subject: [PATCH] Cleanup: Remove unused includes of grease pencil legacy headers Removes unnecessary usages of the following headers: - BKE_gpencil_geom_legacy.h - BKE_gpencil_legacy.h - BKE_gpencil_modifier_legacy.h - BKE_grease_pencil_legacy_convert.hh - DNA_gpencil_legacy_types.h Pull Request: https://projects.blender.org/blender/blender/pulls/141471 --- source/blender/blenkernel/intern/blendfile_link_append.cc | 1 - source/blender/blenkernel/intern/brush.cc | 1 - source/blender/blenkernel/intern/gpencil_legacy.cc | 1 - source/blender/blenkernel/intern/gpencil_modifier_legacy.cc | 1 - source/blender/blenkernel/intern/lib_id.cc | 1 - source/blender/blenkernel/intern/material.cc | 1 - source/blender/blenkernel/intern/object_deform.cc | 2 -- source/blender/blenkernel/intern/object_update.cc | 1 - source/blender/blenkernel/intern/paint.cc | 1 - source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | 1 - .../blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc | 1 - source/blender/draw/engines/gpencil/gpencil_engine_c.cc | 1 - source/blender/draw/engines/gpencil/gpencil_shader_fx.cc | 2 -- source/blender/draw/intern/draw_context.cc | 1 - source/blender/editors/gpencil_legacy/gpencil_utils.cc | 1 - source/blender/editors/object/object_add.cc | 4 ---- source/blender/editors/object/object_transform.cc | 1 - .../blender/editors/space_view3d/view3d_navigate_view_all.cc | 1 - source/blender/editors/transform/transform_gizmo_3d.cc | 1 - source/blender/modifiers/intern/lineart/lineart_cpu.cc | 1 - 20 files changed, 25 deletions(-) diff --git a/source/blender/blenkernel/intern/blendfile_link_append.cc b/source/blender/blenkernel/intern/blendfile_link_append.cc index 55f7e249bd7..25097d4b577 100644 --- a/source/blender/blenkernel/intern/blendfile_link_append.cc +++ b/source/blender/blenkernel/intern/blendfile_link_append.cc @@ -42,7 +42,6 @@ #include "RNA_prototypes.hh" #include "BKE_callbacks.hh" -#include "BKE_grease_pencil_legacy_convert.hh" #include "BKE_idtype.hh" #include "BKE_key.hh" #include "BKE_layer.hh" diff --git a/source/blender/blenkernel/intern/brush.cc b/source/blender/blenkernel/intern/brush.cc index cf9e94a6805..e7737c71f81 100644 --- a/source/blender/blenkernel/intern/brush.cc +++ b/source/blender/blenkernel/intern/brush.cc @@ -29,7 +29,6 @@ #include "BKE_bpath.hh" #include "BKE_brush.hh" #include "BKE_colortools.hh" -#include "BKE_gpencil_legacy.h" #include "BKE_grease_pencil.hh" #include "BKE_idprop.hh" #include "BKE_idtype.hh" diff --git a/source/blender/blenkernel/intern/gpencil_legacy.cc b/source/blender/blenkernel/intern/gpencil_legacy.cc index 024362d8961..22bc7540caa 100644 --- a/source/blender/blenkernel/intern/gpencil_legacy.cc +++ b/source/blender/blenkernel/intern/gpencil_legacy.cc @@ -40,7 +40,6 @@ #include "BKE_collection.hh" #include "BKE_colortools.hh" #include "BKE_deform.hh" -#include "BKE_gpencil_geom_legacy.h" #include "BKE_gpencil_legacy.h" #include "BKE_icons.h" #include "BKE_idtype.hh" diff --git a/source/blender/blenkernel/intern/gpencil_modifier_legacy.cc b/source/blender/blenkernel/intern/gpencil_modifier_legacy.cc index 7b4e1e650cd..37fbecd2903 100644 --- a/source/blender/blenkernel/intern/gpencil_modifier_legacy.cc +++ b/source/blender/blenkernel/intern/gpencil_modifier_legacy.cc @@ -18,7 +18,6 @@ #include "BKE_colortools.hh" #include "BKE_deform.hh" -#include "BKE_gpencil_legacy.h" #include "BKE_gpencil_modifier_legacy.h" #include "BKE_lattice.hh" #include "BKE_lib_id.hh" diff --git a/source/blender/blenkernel/intern/lib_id.cc b/source/blender/blenkernel/intern/lib_id.cc index 4ce7997272f..58709787d02 100644 --- a/source/blender/blenkernel/intern/lib_id.cc +++ b/source/blender/blenkernel/intern/lib_id.cc @@ -48,7 +48,6 @@ #include "BKE_bpath.hh" #include "BKE_context.hh" #include "BKE_global.hh" -#include "BKE_gpencil_legacy.h" #include "BKE_idprop.hh" #include "BKE_idtype.hh" #include "BKE_key.hh" diff --git a/source/blender/blenkernel/intern/material.cc b/source/blender/blenkernel/intern/material.cc index d3d40daa782..764d62b5ddb 100644 --- a/source/blender/blenkernel/intern/material.cc +++ b/source/blender/blenkernel/intern/material.cc @@ -50,7 +50,6 @@ #include "BKE_curves.hh" #include "BKE_displist.h" #include "BKE_editmesh.hh" -#include "BKE_gpencil_legacy.h" #include "BKE_grease_pencil.hh" #include "BKE_icons.h" #include "BKE_idtype.hh" diff --git a/source/blender/blenkernel/intern/object_deform.cc b/source/blender/blenkernel/intern/object_deform.cc index 02ad31b0fc2..8a08ffd5fa4 100644 --- a/source/blender/blenkernel/intern/object_deform.cc +++ b/source/blender/blenkernel/intern/object_deform.cc @@ -21,7 +21,6 @@ #include "DNA_armature_types.h" #include "DNA_cloth_types.h" #include "DNA_curve_types.h" -#include "DNA_gpencil_legacy_types.h" #include "DNA_grease_pencil_types.h" #include "DNA_lattice_types.h" #include "DNA_mesh_types.h" @@ -35,7 +34,6 @@ #include "BKE_action.hh" #include "BKE_deform.hh" #include "BKE_editmesh.hh" -#include "BKE_gpencil_legacy.h" #include "BKE_grease_pencil_vertex_groups.hh" #include "BKE_mesh.hh" #include "BKE_modifier.hh" diff --git a/source/blender/blenkernel/intern/object_update.cc b/source/blender/blenkernel/intern/object_update.cc index efac9706454..648f6c4599d 100644 --- a/source/blender/blenkernel/intern/object_update.cc +++ b/source/blender/blenkernel/intern/object_update.cc @@ -22,7 +22,6 @@ #include "BKE_curves.h" #include "BKE_displist.h" #include "BKE_editmesh.hh" -#include "BKE_gpencil_legacy.h" #include "BKE_grease_pencil.h" #include "BKE_grease_pencil.hh" #include "BKE_lattice.hh" diff --git a/source/blender/blenkernel/intern/paint.cc b/source/blender/blenkernel/intern/paint.cc index 914870ab78e..d56e012f3e1 100644 --- a/source/blender/blenkernel/intern/paint.cc +++ b/source/blender/blenkernel/intern/paint.cc @@ -48,7 +48,6 @@ #include "BKE_context.hh" #include "BKE_crazyspace.hh" #include "BKE_deform.hh" -#include "BKE_gpencil_legacy.h" #include "BKE_idtype.hh" #include "BKE_image.hh" #include "BKE_key.hh" diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index 093a0b274a7..d01c7b98930 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -60,7 +60,6 @@ #include "BKE_curve.hh" #include "BKE_effect.h" #include "BKE_fcurve_driver.h" -#include "BKE_gpencil_legacy.h" #include "BKE_gpencil_modifier_legacy.h" #include "BKE_grease_pencil.hh" #include "BKE_idprop.hh" diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc index a1e525a11f8..ac808df8031 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc @@ -25,7 +25,6 @@ #include "BKE_curve.hh" #include "BKE_global.hh" -#include "BKE_gpencil_legacy.h" #include "BKE_layer.hh" #include "BKE_lib_id.hh" #include "BKE_scene.hh" diff --git a/source/blender/draw/engines/gpencil/gpencil_engine_c.cc b/source/blender/draw/engines/gpencil/gpencil_engine_c.cc index 6c6fe21b535..cc3e4126617 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine_c.cc +++ b/source/blender/draw/engines/gpencil/gpencil_engine_c.cc @@ -11,7 +11,6 @@ #include "BKE_compositor.hh" #include "BKE_context.hh" #include "BKE_curves.hh" -#include "BKE_gpencil_geom_legacy.h" #include "BKE_gpencil_legacy.h" #include "BKE_grease_pencil.hh" #include "BKE_material.hh" diff --git a/source/blender/draw/engines/gpencil/gpencil_shader_fx.cc b/source/blender/draw/engines/gpencil/gpencil_shader_fx.cc index bddf96f4adb..eb0f6214512 100644 --- a/source/blender/draw/engines/gpencil/gpencil_shader_fx.cc +++ b/source/blender/draw/engines/gpencil/gpencil_shader_fx.cc @@ -10,8 +10,6 @@ #include "DNA_shader_fx_types.h" #include "DNA_view3d_types.h" -#include "BKE_gpencil_legacy.h" - #include "BLI_link_utils.h" #include "BLI_math_matrix.h" #include "BLI_math_vector.h" diff --git a/source/blender/draw/intern/draw_context.cc b/source/blender/draw/intern/draw_context.cc index fb96ba80e3e..598c17279f0 100644 --- a/source/blender/draw/intern/draw_context.cc +++ b/source/blender/draw/intern/draw_context.cc @@ -28,7 +28,6 @@ #include "BKE_duplilist.hh" #include "BKE_editmesh.hh" #include "BKE_global.hh" -#include "BKE_gpencil_legacy.h" #include "BKE_grease_pencil.h" #include "BKE_lattice.hh" #include "BKE_layer.hh" diff --git a/source/blender/editors/gpencil_legacy/gpencil_utils.cc b/source/blender/editors/gpencil_legacy/gpencil_utils.cc index 8959f03d04a..d0f4e92557e 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_utils.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_utils.cc @@ -24,7 +24,6 @@ #include "DNA_view3d_types.h" #include "BKE_context.hh" -#include "BKE_gpencil_legacy.h" #include "BKE_paint.hh" #include "BKE_tracking.h" diff --git a/source/blender/editors/object/object_add.cc b/source/blender/editors/object/object_add.cc index fbc1cbb5fe4..ddba034710c 100644 --- a/source/blender/editors/object/object_add.cc +++ b/source/blender/editors/object/object_add.cc @@ -64,11 +64,7 @@ #include "BKE_effect.h" #include "BKE_geometry_set.hh" #include "BKE_geometry_set_instances.hh" -#include "BKE_gpencil_geom_legacy.h" -#include "BKE_gpencil_legacy.h" -#include "BKE_gpencil_modifier_legacy.h" #include "BKE_grease_pencil.hh" -#include "BKE_grease_pencil_legacy_convert.hh" #include "BKE_key.hh" #include "BKE_lattice.hh" #include "BKE_layer.hh" diff --git a/source/blender/editors/object/object_transform.cc b/source/blender/editors/object/object_transform.cc index 23044d3cdcf..d57af101882 100644 --- a/source/blender/editors/object/object_transform.cc +++ b/source/blender/editors/object/object_transform.cc @@ -37,7 +37,6 @@ #include "BKE_curve.hh" #include "BKE_curves.hh" #include "BKE_editmesh.hh" -#include "BKE_gpencil_legacy.h" #include "BKE_grease_pencil.hh" #include "BKE_idtype.hh" #include "BKE_lattice.hh" diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_all.cc b/source/blender/editors/space_view3d/view3d_navigate_view_all.cc index a0b19ba4aad..0efe7fa6742 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_all.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_all.cc @@ -8,7 +8,6 @@ #include "BKE_armature.hh" #include "BKE_context.hh" -#include "BKE_gpencil_geom_legacy.h" #include "BKE_layer.hh" #include "BKE_library.hh" #include "BKE_object.hh" diff --git a/source/blender/editors/transform/transform_gizmo_3d.cc b/source/blender/editors/transform/transform_gizmo_3d.cc index fb8bf0c2570..5a510823ad6 100644 --- a/source/blender/editors/transform/transform_gizmo_3d.cc +++ b/source/blender/editors/transform/transform_gizmo_3d.cc @@ -28,7 +28,6 @@ #include "BKE_curve.hh" #include "BKE_editmesh.hh" #include "BKE_global.hh" -#include "BKE_gpencil_legacy.h" #include "BKE_grease_pencil.hh" #include "BKE_layer.hh" #include "BKE_library.hh" diff --git a/source/blender/modifiers/intern/lineart/lineart_cpu.cc b/source/blender/modifiers/intern/lineart/lineart_cpu.cc index df89509af83..20c8198f0bf 100644 --- a/source/blender/modifiers/intern/lineart/lineart_cpu.cc +++ b/source/blender/modifiers/intern/lineart/lineart_cpu.cc @@ -30,7 +30,6 @@ #include "BKE_deform.hh" #include "BKE_geometry_set.hh" #include "BKE_global.hh" -#include "BKE_gpencil_legacy.h" #include "BKE_grease_pencil.hh" #include "BKE_lib_id.hh" #include "BKE_material.hh"