Commit: 868ef9ec37a9dd4856a8a034f7e3865cf4252b1d Author: Campbell Barton Date: Tue Oct 4 13:54:04 2022 +1100 Branches: master https://developer.blender.org/rB868ef9ec37a9dd4856a8a034f7e3865cf4252b1d
Cleanup: remove unnecessary includes from sculpt_paint =================================================================== M source/blender/editors/sculpt_paint/curves_sculpt_brush.cc M source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc M source/blender/editors/sculpt_paint/curves_sculpt_slide.cc M source/blender/editors/sculpt_paint/paint_canvas.cc M source/blender/editors/sculpt_paint/paint_cursor.c M source/blender/editors/sculpt_paint/paint_curve_undo.c M source/blender/editors/sculpt_paint/paint_image.cc M source/blender/editors/sculpt_paint/paint_image_ops_paint.cc M source/blender/editors/sculpt_paint/paint_mask.c M source/blender/editors/sculpt_paint/paint_vertex.cc M source/blender/editors/sculpt_paint/paint_vertex_proj.c M source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c M source/blender/editors/sculpt_paint/sculpt.c M source/blender/editors/sculpt_paint/sculpt_boundary.c M source/blender/editors/sculpt_paint/sculpt_brush_types.c M source/blender/editors/sculpt_paint/sculpt_cloth.c M source/blender/editors/sculpt_paint/sculpt_detail.c M source/blender/editors/sculpt_paint/sculpt_dyntopo.c M source/blender/editors/sculpt_paint/sculpt_expand.c M source/blender/editors/sculpt_paint/sculpt_face_set.cc M source/blender/editors/sculpt_paint/sculpt_filter_color.c M source/blender/editors/sculpt_paint/sculpt_filter_mask.c M source/blender/editors/sculpt_paint/sculpt_filter_mesh.c M source/blender/editors/sculpt_paint/sculpt_geodesic.c M source/blender/editors/sculpt_paint/sculpt_intern.h M source/blender/editors/sculpt_paint/sculpt_mask_expand.c M source/blender/editors/sculpt_paint/sculpt_mask_init.c M source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.c M source/blender/editors/sculpt_paint/sculpt_ops.c M source/blender/editors/sculpt_paint/sculpt_paint_color.c M source/blender/editors/sculpt_paint/sculpt_paint_image.cc M source/blender/editors/sculpt_paint/sculpt_pose.c M source/blender/editors/sculpt_paint/sculpt_smooth.c M source/blender/editors/sculpt_paint/sculpt_transform.c M source/blender/editors/sculpt_paint/sculpt_undo.c =================================================================== diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_brush.cc b/source/blender/editors/sculpt_paint/curves_sculpt_brush.cc index abfcee81e8a..e276bae6697 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_brush.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_brush.cc @@ -8,7 +8,6 @@ #include "BKE_bvhutils.h" #include "BKE_context.h" #include "BKE_curves.hh" -#include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_report.h" @@ -16,10 +15,6 @@ #include "UI_interface.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" - -#include "BLI_enumerable_thread_specific.hh" #include "BLI_length_parameterize.hh" #include "BLI_task.hh" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc b/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc index bc354ed66f4..2624d70ccf7 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc @@ -7,8 +7,6 @@ #include "BLI_length_parameterize.hh" #include "BLI_vector.hh" -#include "PIL_time.h" - #include "DEG_depsgraph.h" #include "BKE_attribute_math.hh" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc b/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc index c607f8f3b69..ae89bc1c58b 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc @@ -8,8 +8,6 @@ #include "BLI_float4x4.hh" #include "BLI_vector.hh" -#include "PIL_time.h" - #include "DEG_depsgraph.h" #include "BKE_attribute_math.hh" @@ -17,17 +15,13 @@ #include "BKE_bvhutils.h" #include "BKE_context.h" #include "BKE_curves.hh" -#include "BKE_geometry_set.hh" #include "BKE_mesh.h" -#include "BKE_mesh_runtime.h" #include "BKE_mesh_sample.hh" -#include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_paint.h" #include "BKE_report.h" #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" @@ -37,8 +31,6 @@ #include "ED_screen.h" #include "ED_view3d.h" -#include "UI_interface.h" - #include "WM_api.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/sculpt_paint/paint_canvas.cc b/source/blender/editors/sculpt_paint/paint_canvas.cc index 9262cbebcac..22e1ecbedd7 100644 --- a/source/blender/editors/sculpt_paint/paint_canvas.cc +++ b/source/blender/editors/sculpt_paint/paint_canvas.cc @@ -1,4 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ + #include "BLI_compiler_compat.h" #include "DNA_material_types.h" diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c index 164e13ac3c9..d5379a4cfcd 100644 --- a/source/blender/editors/sculpt_paint/paint_cursor.c +++ b/source/blender/editors/sculpt_paint/paint_cursor.c @@ -27,7 +27,6 @@ #include "BKE_context.h" #include "BKE_curve.h" #include "BKE_image.h" -#include "BKE_node.h" #include "BKE_object.h" #include "BKE_paint.h" diff --git a/source/blender/editors/sculpt_paint/paint_curve_undo.c b/source/blender/editors/sculpt_paint/paint_curve_undo.c index 2678ec6e115..a5daa13b762 100644 --- a/source/blender/editors/sculpt_paint/paint_curve_undo.c +++ b/source/blender/editors/sculpt_paint/paint_curve_undo.c @@ -9,9 +9,6 @@ #include "MEM_guardedalloc.h" #include "DNA_brush_types.h" -#include "DNA_space_types.h" - -#include "BLI_array_utils.h" #include "BKE_context.h" #include "BKE_paint.h" @@ -24,6 +21,10 @@ #include "paint_intern.h" +#ifndef NDEBUG +# include "BLI_array_utils.h" /* #BLI_array_is_zeroed */ +#endif + /* -------------------------------------------------------------------- */ /** \name Undo Conversion * \{ */ diff --git a/source/blender/editors/sculpt_paint/paint_image.cc b/source/blender/editors/sculpt_paint/paint_image.cc index 23cf65cd90a..8c6358520ca 100644 --- a/source/blender/editors/sculpt_paint/paint_image.cc +++ b/source/blender/editors/sculpt_paint/paint_image.cc @@ -13,7 +13,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_blenlib.h" #include "BLI_math.h" #include "BLI_utildefines.h" @@ -35,9 +34,7 @@ #include "BKE_main.h" #include "BKE_material.h" #include "BKE_mesh.h" -#include "BKE_node.h" #include "BKE_paint.h" -#include "BKE_undo_system.h" #include "NOD_texture.h" @@ -50,7 +47,6 @@ #include "ED_object.h" #include "ED_paint.h" #include "ED_screen.h" -#include "ED_view3d.h" #include "WM_api.h" #include "WM_message.h" @@ -60,9 +56,6 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "GPU_immediate.h" -#include "GPU_state.h" - #include "IMB_colormanagement.h" #include "paint_intern.h" diff --git a/source/blender/editors/sculpt_paint/paint_image_ops_paint.cc b/source/blender/editors/sculpt_paint/paint_image_ops_paint.cc index a5dd558e27a..ced7949c69f 100644 --- a/source/blender/editors/sculpt_paint/paint_image_ops_paint.cc +++ b/source/blender/editors/sculpt_paint/paint_image_ops_paint.cc @@ -17,8 +17,6 @@ #include "BKE_paint.h" #include "BKE_undo_system.h" -#include "DEG_depsgraph.h" - #include "ED_paint.h" #include "ED_view3d.h" @@ -28,11 +26,8 @@ #include "MEM_guardedalloc.h" #include "RNA_access.h" -#include "RNA_define.h" #include "WM_api.h" -#include "WM_message.h" -#include "WM_toolsystem.h" #include "WM_types.h" #include "ED_image.h" diff --git a/source/blender/editors/sculpt_paint/paint_mask.c b/source/blender/editors/sculpt_paint/paint_mask.c index ca1e5489460..e1fd731a4b7 100644 --- a/source/blender/editors/sculpt_paint/paint_mask.c +++ b/source/blender/editors/sculpt_paint/paint_mask.c @@ -41,12 +41,10 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_screen.h" #include "ED_sculpt.h" #include "ED_view3d.h" #include "bmesh.h" -#include "bmesh_tools.h" #include "tools/bmesh_boolean.h" #include "paint_intern.h" diff --git a/source/blender/editors/sculpt_paint/paint_vertex.cc b/source/blender/editors/sculpt_paint/paint_vertex.cc index ae1db0b1ce4..b2ca7268cb6 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.cc +++ b/source/blender/editors/sculpt_paint/paint_vertex.cc @@ -29,7 +29,6 @@ #include "DNA_scene_types.h" #include "RNA_access.h" -#include "RNA_prototypes.h" #include "BKE_attribute.h" #include "BKE_attribute.hh" @@ -38,17 +37,13 @@ #include "BKE_context.h" #include "BKE_deform.h" #include "BKE_editmesh.h" -#include "BKE_layer.h" #include "BKE_lib_id.h" -#include "BKE_main.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" -#include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_object_deform.h" #include "BKE_paint.h" #include "BKE_report.h" -#include "BKE_subsurf.h" #include "DEG_depsgraph.h" @@ -57,7 +52,6 @@ #include "WM_toolsystem.h" #include "WM_types.h" -#include "ED_armature.h" #include "ED_image.h" #include "ED_mesh.h" #include "ED_object.h" diff --git a/source/blender/editors/sculpt_paint/paint_vertex_proj.c b/source/blender/editors/sculpt_paint/paint_vertex_proj.c index b4e2d4901c9..bac3e7a9e52 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_proj.c +++ b/source/blender/editors/sculpt_paint/paint_vertex_proj.c @@ -10,7 +10,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_listbase.h" #include "BLI_math.h" #include "DNA_mesh_types.h" diff --git a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c index a7f43830e6b..fca25ee2e4b 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c +++ b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c @@ -7,7 +7,6 @@ #include "MEM_guardedalloc.h" #include "BLI_bitmap.h" -#include "BLI_blenlib.h" #include "BLI_math.h" #include "DNA_brush_types.h" diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 85a300484c3..271e94d48d4 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -12,17 +12,10 @@ #include "BLI_dial_2d.h" #include "BLI_ghash.h" #include "BLI_gsqueue.h" -#include "BLI_hash.h" #include "BLI_math.h" -#include "BLI_math_color.h" -#include "BLI_math_color_blend.h" #include "BLI_task.h" #include "BLI_utildefines.h" -#include "BLT_translation.h" - -#include "PIL_time.h" - #include "DNA_brush_types.h" #include "DNA_customdata_types.h" #include "DNA_mesh_types.h" @@ -37,24 +30,17 @@ #include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_image.h" -#include "BKE_kelvinlet.h" #include "BKE_key.h" #include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" -#include "BKE_mesh_mirror.h" #include "BKE_modifier.h" #include "BKE_multires.h" -#include "BKE_node.h" #include "BKE_object.h" #include "BKE_paint.h" -#include "BKE_particle.h" #include "BKE_pbvh.h" -#include "BKE_pointcache.h" #include "BKE_report.h" -#include "BKE_scene.h" -#include "BKE_screen.h" #include "BKE_subdiv_ccg.h" #include "BKE_subsurf.h" @@ -62,29 +48,21 @@ #include "DEG_depsgraph.h" -#include "IMB_colormanagement.h" - #include "WM_api.h" -#include "WM_message.h" -#include "WM_toolsystem.h" #include "WM_types.h" -#include "ED_object.h" #include "ED_paint.h" #include "ED_screen.h" #include "ED_sculpt.h" #include "ED_view3d.h" + #include "paint_intern.h" #include "sculpt_intern.h" #include "RNA_access.h" #include "RNA_define.h" -#include "UI_interface.h" -#include "UI_resources.h" - #include "bmesh.h" -#include "bmesh_tools.h" #include <math.h> #include <stdlib.h> diff --git a/source/blender/editors/sculpt_paint/sculpt_boundary.c b/source/blender/editors/sculpt_paint/sculpt_boundary.c index f6da40065e0..355f260ae11 100644 --- a/source/blender/editors/sculpt_paint/sculpt_boundary.c +++ b/source/blender/editors/sculpt_paint/sculpt_boundary.c @@ -7,13 +7,11 @@ #include "MEM_guardedalloc.h" -#include "BLI_blenlib.h" #include "BLI_edgehash.h" #include "BLI_math.h" #include "BLI_task.h" #include "DNA_brush_types.h" -#include "DNA_mesh_types.h" @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs