diff options
Diffstat (limited to 'source/blender')
35 files changed, 11 insertions, 411 deletions
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" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" @@ -21,20 +19,13 @@ #include "BKE_ccg.h" #include "BKE_colortools.h" #include "BKE_context.h" -#include "BKE_mesh.h" -#include "BKE_multires.h" -#include "BKE_node.h" -#include "BKE_object.h" #include "BKE_paint.h" #include "BKE_pbvh.h" -#include "BKE_scene.h" #include "paint_intern.h" #include "sculpt_intern.h" #include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_matrix.h" #include "GPU_state.h" #include "bmesh.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_brush_types.c b/source/blender/editors/sculpt_paint/sculpt_brush_types.c index f2f7eac072e..7c4fffb67b0 100644 --- a/source/blender/editors/sculpt_paint/sculpt_brush_types.c +++ b/source/blender/editors/sculpt_paint/sculpt_brush_types.c @@ -8,26 +8,15 @@ #include "MEM_guardedalloc.h" -#include "BLI_blenlib.h" -#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" #include "DNA_meshdata_types.h" -#include "DNA_node_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -35,53 +24,16 @@ #include "BKE_ccg.h" #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" - -#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_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_cloth.c b/source/blender/editors/sculpt_paint/sculpt_cloth.c index 36093228f7d..b6bb4c185f9 100644 --- a/source/blender/editors/sculpt_paint/sculpt_cloth.c +++ b/source/blender/editors/sculpt_paint/sculpt_cloth.c @@ -7,22 +7,15 @@ #include "MEM_guardedalloc.h" -#include "BLI_blenlib.h" -#include "BLI_dial_2d.h" #include "BLI_edgehash.h" #include "BLI_gsqueue.h" -#include "BLI_hash.h" #include "BLI_math.h" #include "BLI_task.h" #include "BLI_utildefines.h" -#include "BLT_translation.h" - #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" @@ -32,41 +25,16 @@ #include "BKE_collision.h" #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" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" #include "WM_api.h" -#include "WM_message.h" -#include "WM_toolsystem.h" #include "WM_types.h" -#include "ED_object.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" @@ -78,10 +46,8 @@ #include "GPU_state.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_detail.c b/source/blender/editors/sculpt_paint/sculpt_detail.c index 8f87cd1b6ed..6dd718d6a0c 100644 --- a/source/blender/editors/sculpt_paint/sculpt_detail.c +++ b/source/blender/editors/sculpt_paint/sculpt_detail.c @@ -30,7 +30,6 @@ #include "WM_types.h" #include "ED_screen.h" -#include "ED_sculpt.h" #include "ED_space_api.h" #include "ED_view3d.h" #include "sculpt_intern.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_dyntopo.c b/source/blender/editors/sculpt_paint/sculpt_dyntopo.c index a524f84cc6e..388f4111555 100644 --- a/source/blender/editors/sculpt_paint/sculpt_dyntopo.c +++ b/source/blender/editors/sculpt_paint/sculpt_dyntopo.c @@ -7,9 +7,6 @@ #include "MEM_guardedalloc.h" -#include "BLI_blenlib.h" -#include "BLI_hash.h" -#include "BLI_math.h" #include "BLI_task.h" #include "BLT_translation.h" @@ -18,12 +15,10 @@ #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" -#include "BKE_brush.h" #include "BKE_context.h" #include "BKE_global.h" #include "BKE_main.h" #include "BKE_mesh.h" -#include "BKE_mesh_mapping.h" #include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_paint.h" @@ -31,26 +26,15 @@ #include "BKE_pbvh.h" #include "BKE_pointcache.h" #include "BKE_scene.h" -#include "BKE_screen.h" #include "DEG_depsgraph.h" #include "WM_api.h" -#include "WM_message.h" -#include "WM_toolsystem.h" #include "WM_types.h" -#include "ED_object.h" -#include "ED_screen.h" -#include "ED_sculpt.h" #include "ED_undo.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" diff --git a/source/blender/editors/sculpt_paint/sculpt_expand.c b/source/blender/editors/sculpt_paint/sculpt_expand.c index ecf296fbd66..90279cb339c 100644 --- a/source/blender/editors/sculpt_paint/sculpt_expand.c +++ b/source/blender/editors/sculpt_paint/sculpt_expand.c @@ -7,13 +7,10 @@ #include "MEM_guardedalloc.h" -#include "BLI_blenlib.h" #include "BLI_linklist_stack.h" #include "BLI_math.h" #include "BLI_task.h" -#include "BLT_translation.h" - #include "DNA_brush_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" @@ -27,29 +24,21 @@ #include "BKE_image.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" -#include "BKE_multires.h" -#include "BKE_node.h" -#include "BKE_object.h" #include "BKE_paint.h" #include "BKE_pbvh.h" #include "BKE_report.h" -#include "BKE_scene.h" #include "BKE_subdiv_ccg.h" #include "DEG_depsgraph.h" #include "WM_api.h" -#include "WM_message.h" -#include "WM_toolsystem.h" #include "WM_types.h" #include "RNA_access.h" #include "RNA_define.h" -#include "ED_object.h" #include "ED_screen.h" #include "ED_sculpt.h" -#include "ED_view3d.h" #include "paint_intern.h" #include "sculpt_intern.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_face_set.cc b/source/blender/editors/sculpt_paint/sculpt_face_set.cc index 894fa0a5d64..8ff84dabbbe 100644 --- a/source/blender/editors/sculpt_paint/sculpt_face_set.cc +++ b/source/blender/editors/sculpt_paint/sculpt_face_set.cc @@ -27,7 +27,6 @@ #include "DNA_scene_types.h" #include "BKE_attribute.hh" -#include "BKE_brush.h" #include "BKE_ccg.h" #include "BKE_colortools.h" #include "BKE_context.h" @@ -35,25 +34,17 @@ #include "BKE_mesh.h" #include "BKE_mesh_fair.h" #include "BKE_mesh_mapping.h" -#include "BKE_multires.h" -#include "BKE_node.h" #include "BKE_object.h" #include "BKE_paint.h" #include "BKE_pbvh.h" -#include "BKE_scene.h" #include "DEG_depsgraph.h" #include "WM_api.h" -#include "WM_message.h" -#include "WM_toolsystem.h" #include "WM_types.h" -#include "ED_object.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" diff --git a/source/blender/editors/sculpt_paint/sculpt_filter_color.c b/source/blender/editors/sculpt_paint/sculpt_filter_color.c index 0d21aa24e7d..89cb67a875f 100644 --- a/source/blender/editors/sculpt_paint/sculpt_filter_color.c +++ b/source/blender/editors/sculpt_paint/sculpt_filter_color.c @@ -7,47 +7,29 @@ #include "MEM_guardedalloc.h" -#include "BLI_blenlib.h" -#include "BLI_hash.h" #include "BLI_math.h" #include "BLI_math_color_blend.h" #include "BLI_task.h" -#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "BKE_brush.h" -#include "BKE_colortools.h" #include "BKE_context.h" -#include "BKE_mesh.h" -#include "BKE_mesh_mapping.h" -#include "BKE_object.h" #include "BKE_paint.h" #include "BKE_pbvh.h" -#include "BKE_report.h" -#include "BKE_scene.h" #include "IMB_colormanagement.h" #include "DEG_depsgraph.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 "paint_intern.h" #include "sculpt_intern.h" #include "RNA_access.h" #include "RNA_define.h" -#include "UI_interface.h" - #include "bmesh.h" #include <math.h> diff --git a/source/blender/editors/sculpt_paint/sculpt_filter_mask.c b/source/blender/editors/sculpt_paint/sculpt_filter_mask.c index c4e719da006..69eac9a6168 100644 --- a/source/blender/editors/sculpt_paint/sculpt_filter_mask.c +++ b/source/blender/editors/sculpt_paint/sculpt_filter_mask.c @@ -7,42 +7,26 @@ #include "MEM_guardedalloc.h" -#include "BLI_blenlib.h" -#include "BLI_hash.h" #include "BLI_math.h" #include "BLI_task.h" -#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" -#include "BKE_brush.h" #include "BKE_context.h" -#include "BKE_mesh.h" -#include "BKE_mesh_mapping.h" -#include "BKE_object.h" #include "BKE_paint.h" #include "BKE_pbvh.h" -#include "BKE_scene.h" #include "DEG_depsgraph.h" #include "WM_api.h" -#include "WM_message.h" -#include "WM_toolsystem.h" #include "WM_types.h" -#include "ED_object.h" -#include "ED_screen.h" -#include "ED_sculpt.h" -#include "paint_intern.h" #include "sculpt_intern.h" #include "RNA_access.h" #include "RNA_define.h" -#include "UI_interface.h" - #include "bmesh.h" #include <math.h> diff --git a/source/blender/editors/sculpt_paint/sculpt_filter_mesh.c b/source/blender/editors/sculpt_paint/sculpt_filter_mesh.c index 3fdc2eaff0f..1fa53eaa006 100644 --- a/source/blender/editors/sculpt_paint/sculpt_filter_mesh.c +++ b/source/blender/editors/sculpt_paint/sculpt_filter_mesh.c @@ -7,34 +7,24 @@ #include "MEM_guardedalloc.h" -#include "BLI_blenlib.h" #include "BLI_hash.h" #include "BLI_math.h" #include "BLI_task.h" -#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "BKE_brush.h" #include "BKE_context.h" -#include "BKE_mesh.h" -#include "BKE_mesh_mapping.h" -#include "BKE_object.h" #include "BKE_paint.h" #include "BKE_pbvh.h" -#include "BKE_scene.h" #include "DEG_depsgraph.h" #include "WM_api.h" -#include "WM_message.h" -#include "WM_toolsystem.h" #include "WM_types.h" -#include "ED_object.h" -#include "ED_screen.h" -#include "ED_sculpt.h" #include "ED_view3d.h" + #include "paint_intern.h" #include "sculpt_intern.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_geodesic.c b/source/blender/editors/sculpt_paint/sculpt_geodesic.c index 5dd602bc36d..5d74853be8c 100644 --- a/source/blender/editors/sculpt_paint/sculpt_geodesic.c +++ b/source/blender/editors/sculpt_paint/sculpt_geodesic.c @@ -7,52 +7,26 @@ #include "MEM_guardedalloc.h" -#include "BLI_blenlib.h" #include "BLI_linklist_stack.h" #include "BLI_math.h" #include "BLI_task.h" -#include "BLT_translation.h" - #include "DNA_brush_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "BKE_brush.h" #include "BKE_ccg.h" -#include "BKE_colortools.h" #include "BKE_context.h" -#include "BKE_image.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" -#include "BKE_multires.h" -#include "BKE_node.h" #include "BKE_object.h" #include "BKE_paint.h" #include "BKE_pbvh.h" -#include "BKE_scene.h" -#include "BKE_subdiv_ccg.h" - -#include "DEG_depsgraph.h" - -#include "WM_api.h" -#include "WM_toolsystem.h" -#include "WM_types.h" -#include "RNA_access.h" -#include "RNA_define.h" - -#include "ED_object.h" -#include "ED_screen.h" -#include "ED_sculpt.h" -#include "ED_view3d.h" #include "paint_intern.h" #include "sculpt_intern.h" -#include "IMB_colormanagement.h" -#include "IMB_imbuf.h" - #include "bmesh.h" #include <math.h> diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.h b/source/blender/editors/sculpt_paint/sculpt_intern.h index 3775ea82b5e..d84d7f2f6fb 100644 --- a/source/blender/editors/sculpt_paint/sculpt_intern.h +++ b/source/blender/editors/sculpt_paint/sculpt_intern.h @@ -35,6 +35,9 @@ struct Object; struct SculptUndoNode; struct bContext; struct PaintModeSettings; +struct wmKeyConfig; +struct wmOperator; +struct wmOperatorType; /* Updates */ diff --git a/source/blender/editors/sculpt_paint/sculpt_mask_expand.c b/source/blender/editors/sculpt_paint/sculpt_mask_expand.c index ec246cd3788..56ddb99fe28 100644 --- a/source/blender/editors/sculpt_paint/sculpt_mask_expand.c +++ b/source/blender/editors/sculpt_paint/sculpt_mask_expand.c @@ -7,44 +7,29 @@ #include "MEM_guardedalloc.h" -#include "BLI_blenlib.h" #include "BLI_math.h" #include "BLI_task.h" #include "BLT_translation.h" #include "DNA_brush_types.h" -#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "BKE_brush.h" #include "BKE_ccg.h" -#include "BKE_colortools.h" #include "BKE_context.h" -#include "BKE_mesh.h" -#include "BKE_multires.h" -#include "BKE_node.h" -#include "BKE_object.h" #include "BKE_paint.h" #include "BKE_pbvh.h" -#include "BKE_scene.h" #include "DEG_depsgraph.h" #include "WM_api.h" -#include "WM_message.h" -#include "WM_toolsystem.h" #include "WM_types.h" #include "RNA_access.h" #include "RNA_define.h" -#include "ED_object.h" #include "ED_screen.h" -#include "ED_sculpt.h" -#include "ED_view3d.h" -#include "paint_intern.h" #include "sculpt_intern.h" #include "bmesh.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_mask_init.c b/source/blender/editors/sculpt_paint/sculpt_mask_init.c index b9b889ab2ce..5d7ef9aab15 100644 --- a/source/blender/editors/sculpt_paint/sculpt_mask_init.c +++ b/source/blender/editors/sculpt_paint/sculpt_mask_init.c @@ -7,27 +7,19 @@ #include "MEM_guardedalloc.h" -#include "BLI_blenlib.h" #include "BLI_hash.h" #include "BLI_math.h" #include "BLI_task.h" -#include "BLT_translation.h" - #include "PIL_time.h" #include "DNA_brush_types.h" -#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "BKE_brush.h" #include "BKE_ccg.h" #include "BKE_context.h" -#include "BKE_mesh.h" #include "BKE_multires.h" -#include "BKE_node.h" -#include "BKE_object.h" #include "BKE_paint.h" #include "BKE_pbvh.h" @@ -39,8 +31,6 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "ED_sculpt.h" -#include "paint_intern.h" #include "sculpt_intern.h" #include "bmesh.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.c b/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.c index 9f57f9d6713..fd8f5b8945c 100644 --- a/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.c +++ b/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.c @@ -5,36 +5,22 @@ * \ingroup edsculpt */ -#include "MEM_guardedalloc.h" - -#include "BLI_blenlib.h" #include "BLI_math.h" #include "BLI_task.h" #include "DNA_brush_types.h" -#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "BKE_brush.h" #include "BKE_ccg.h" -#include "BKE_colortools.h" #include "BKE_context.h" -#include "BKE_mesh.h" -#include "BKE_multires.h" -#include "BKE_node.h" -#include "BKE_object.h" #include "BKE_paint.h" #include "BKE_pbvh.h" -#include "BKE_scene.h" -#include "paint_intern.h" #include "sculpt_intern.h" #include "GPU_immediate.h" -#include "GPU_immediate_util.h" #include "GPU_matrix.h" -#include "GPU_state.h" #include "bmesh.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_ops.c b/source/blender/editors/sculpt_paint/sculpt_ops.c index 258e14479c8..1042356489b 100644 --- a/source/blender/editors/sculpt_paint/sculpt_ops.c +++ b/source/blender/editors/sculpt_paint/sculpt_ops.c @@ -8,28 +8,14 @@ #include "MEM_guardedalloc.h" -#include "BLI_array.h" -#include "BLI_blenlib.h" -#include "BLI_dial_2d.h" #include "BLI_ghash.h" #include "BLI_gsqueue.h" -#include "BLI_hash.h" -#include "BLI_link_utils.h" -#include "BLI_linklist.h" -#include "BLI_linklist_stack.h" -#include "BLI_listbase.h" #include "BLI_math.h" -#include "BLI_math_color_blend.h" -#include "BLI_memarena.h" -#include "BLI_rand.h" #include "BLI_task.h" #include "BLI_utildefines.h" -#include "atomic_ops.h" #include "BLT_translation.h" -#include "PIL_time.h" - #include "DNA_brush_types.h" #include "DNA_customdata_types.h" #include "DNA_listBase.h" @@ -42,44 +28,23 @@ #include "BKE_attribute.h" #include "BKE_brush.h" #include "BKE_ccg.h" -#include "BKE_colortools.h" #include "BKE_context.h" -#include "BKE_image.h" -#include "BKE_kelvinlet.h" -#include "BKE_key.h" #include "BKE_layer.h" -#include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_mesh.h" -#include "BKE_mesh_fair.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" #include "DEG_depsgraph.h" -#include "DEG_depsgraph_query.h" #include "IMB_colormanagement.h" -#include "GPU_batch.h" -#include "GPU_batch_presets.h" -#include "GPU_immediate.h" -#include "GPU_immediate_util.h" -#include "GPU_matrix.h" -#include "GPU_state.h" - #include "WM_api.h" #include "WM_message.h" #include "WM_toolsystem.h" @@ -89,22 +54,17 @@ #include "ED_object.h" #include "ED_screen.h" #include "ED_sculpt.h" -#include "ED_space_api.h" -#include "ED_transform_snap_object_context.h" -#include "ED_view3d.h" #include "paint_intern.h" #include "sculpt_intern.h" #include "RNA_access.h" #include "RNA_define.h" -#include "RNA_path.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_paint_color.c b/source/blender/editors/sculpt_paint/sculpt_paint_color.c index 7946affdec5..ee716d1107a 100644 --- a/source/blender/editors/sculpt_paint/sculpt_paint_color.c +++ b/source/blender/editors/sculpt_paint/sculpt_paint_color.c @@ -7,46 +7,24 @@ #include "MEM_guardedalloc.h" -#include "BLI_blenlib.h" #include "BLI_hash.h" #include "BLI_math.h" #include "BLI_math_color_blend.h" #include "BLI_task.h" -#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "BKE_brush.h" #include "BKE_colorband.h" #include "BKE_colortools.h" #include "BKE_context.h" -#include "BKE_mesh.h" -#include "BKE_mesh_mapping.h" -#include "BKE_object.h" #include "BKE_paint.h" #include "BKE_pbvh.h" -#include "BKE_scene.h" - -#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_screen.h" -#include "ED_sculpt.h" -#include "paint_intern.h" #include "sculpt_intern.h" -#include "RNA_access.h" -#include "RNA_define.h" - -#include "UI_interface.h" - #include "IMB_imbuf.h" #include "bmesh.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_paint_image.cc b/source/blender/editors/sculpt_paint/sculpt_paint_image.cc index 8d6fbaa5988..d3b3100458d 100644 --- a/source/blender/editors/sculpt_paint/sculpt_paint_image.cc +++ b/source/blender/editors/sculpt_paint/sculpt_paint_image.cc @@ -2,13 +2,9 @@ * Copyright 2022 Blender Foundation. All rights reserved. */ #include "DNA_image_types.h" -#include "DNA_material_types.h" -#include "DNA_mesh_types.h" -#include "DNA_node_types.h" #include "DNA_object_types.h" #include "ED_paint.h" -#include "ED_uvedit.h" #include "BLI_math.h" #include "BLI_math_color_blend.h" @@ -19,14 +15,11 @@ #include "BKE_brush.h" #include "BKE_image_wrappers.hh" -#include "BKE_material.h" #include "BKE_pbvh.h" #include "BKE_pbvh_pixels.hh" #include "bmesh.h" -#include "NOD_shader.h" - #include "sculpt_intern.h" namespace blender::ed::sculpt_paint::paint::image { diff --git a/source/blender/editors/sculpt_paint/sculpt_pose.c b/source/blender/editors/sculpt_paint/sculpt_pose.c index fa33417faba..5f671c1f0e1 100644 --- a/source/blender/editors/sculpt_paint/sculpt_pose.c +++ b/source/blender/editors/sculpt_paint/sculpt_pose.c @@ -7,12 +7,10 @@ #include "MEM_guardedalloc.h" -#include "BLI_blenlib.h" #include "BLI_math.h" #include "BLI_task.h" #include "DNA_brush_types.h" -#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" @@ -20,13 +18,8 @@ #include "BKE_ccg.h" #include "BKE_colortools.h" #include "BKE_context.h" -#include "BKE_mesh.h" -#include "BKE_multires.h" -#include "BKE_node.h" -#include "BKE_object.h" #include "BKE_paint.h" #include "BKE_pbvh.h" -#include "BKE_scene.h" #include "paint_intern.h" #include "sculpt_intern.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_smooth.c b/source/blender/editors/sculpt_paint/sculpt_smooth.c index 08a6c037608..09b1c69da45 100644 --- a/source/blender/editors/sculpt_paint/sculpt_smooth.c +++ b/source/blender/editors/sculpt_paint/sculpt_smooth.c @@ -7,40 +7,18 @@ #include "MEM_guardedalloc.h" -#include "BLI_blenlib.h" -#include "BLI_hash.h" #include "BLI_math.h" #include "BLI_task.h" #include "DNA_brush_types.h" -#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "BKE_brush.h" #include "BKE_context.h" -#include "BKE_mesh.h" -#include "BKE_mesh_mapping.h" -#include "BKE_object.h" #include "BKE_paint.h" #include "BKE_pbvh.h" -#include "BKE_scene.h" -#include "DEG_depsgraph.h" - -#include "WM_api.h" -#include "WM_message.h" -#include "WM_toolsystem.h" -#include "WM_types.h" - -#include "ED_object.h" -#include "ED_screen.h" -#include "ED_sculpt.h" -#include "paint_intern.h" #include "sculpt_intern.h" -#include "RNA_access.h" -#include "RNA_define.h" - #include "bmesh.h" #include <math.h> diff --git a/source/blender/editors/sculpt_paint/sculpt_transform.c b/source/blender/editors/sculpt_paint/sculpt_transform.c index d7bb692f85a..0463e8adbaf 100644 --- a/source/blender/editors/sculpt_paint/sculpt_transform.c +++ b/source/blender/editors/sculpt_paint/sculpt_transform.c @@ -7,31 +7,22 @@ #include "MEM_guardedalloc.h" -#include "BLI_blenlib.h" #include "BLI_math.h" #include "BLI_task.h" -#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "BKE_brush.h" #include "BKE_context.h" #include "BKE_kelvinlet.h" -#include "BKE_mesh.h" -#include "BKE_mesh_mapping.h" -#include "BKE_object.h" #include "BKE_paint.h" #include "BKE_pbvh.h" -#include "BKE_scene.h" #include "DEG_depsgraph.h" #include "WM_api.h" -#include "WM_message.h" -#include "WM_toolsystem.h" #include "WM_types.h" -#include "ED_object.h" #include "ED_screen.h" #include "ED_sculpt.h" #include "ED_view3d.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c b/source/blender/editors/sculpt_paint/sculpt_undo.c index eabaa3c5f4f..13e3dd64521 100644 --- a/source/blender/editors/sculpt_paint/sculpt_undo.c +++ b/source/blender/editors/sculpt_paint/sculpt_undo.c @@ -56,7 +56,6 @@ #include "BKE_layer.h" #include "BKE_main.h" #include "BKE_mesh.h" -#include "BKE_mesh_mapping.h" #include "BKE_mesh_runtime.h" #include "BKE_multires.h" #include "BKE_object.h" |