diff options
Diffstat (limited to 'source/blender/editors/sculpt_paint')
22 files changed, 87 insertions, 87 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c index 0ddce872545..c035863203b 100644 --- a/source/blender/editors/sculpt_paint/paint_cursor.c +++ b/source/blender/editors/sculpt_paint/paint_cursor.c @@ -29,8 +29,8 @@ #include "BLI_utildefines.h" #include "DNA_brush_types.h" -#include "DNA_customdata_types.h" #include "DNA_color_types.h" +#include "DNA_customdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" @@ -39,13 +39,13 @@ #include "DNA_view3d_types.h" #include "BKE_brush.h" +#include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_curve.h" #include "BKE_image.h" #include "BKE_node.h" -#include "BKE_paint.h" -#include "BKE_colortools.h" #include "BKE_object.h" +#include "BKE_paint.h" #include "WM_api.h" #include "wm_cursors.h" diff --git a/source/blender/editors/sculpt_paint/paint_curve.c b/source/blender/editors/sculpt_paint/paint_curve.c index 4578e211c97..68fd2f15877 100644 --- a/source/blender/editors/sculpt_paint/paint_curve.c +++ b/source/blender/editors/sculpt_paint/paint_curve.c @@ -18,8 +18,8 @@ * \ingroup edsculpt */ -#include <string.h> #include <limits.h> +#include <string.h> #include "MEM_guardedalloc.h" @@ -35,8 +35,8 @@ #include "BKE_main.h" #include "BKE_paint.h" -#include "ED_view3d.h" #include "ED_paint.h" +#include "ED_view3d.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/sculpt_paint/paint_hide.c b/source/blender/editors/sculpt_paint/paint_hide.c index 32b0965363a..ce5a80585b0 100644 --- a/source/blender/editors/sculpt_paint/paint_hide.c +++ b/source/blender/editors/sculpt_paint/paint_hide.c @@ -33,12 +33,12 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BKE_pbvh.h" #include "BKE_ccg.h" #include "BKE_context.h" #include "BKE_mesh.h" #include "BKE_multires.h" #include "BKE_paint.h" +#include "BKE_pbvh.h" #include "BKE_subsurf.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index dd064591018..cbb0ce84156 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -24,14 +24,14 @@ */ #include <float.h> -#include <string.h> -#include <stdio.h> #include <math.h> +#include <stdio.h> +#include <string.h> #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLT_translation.h" @@ -44,9 +44,9 @@ #include "DNA_node_types.h" #include "DNA_object_types.h" +#include "BKE_brush.h" #include "BKE_colorband.h" #include "BKE_context.h" -#include "BKE_brush.h" #include "BKE_image.h" #include "BKE_main.h" #include "BKE_material.h" @@ -67,9 +67,9 @@ #include "ED_view3d.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/sculpt_paint/paint_image_2d.c b/source/blender/editors/sculpt_paint/paint_image_2d.c index 4a99e40a361..fc56c5cb6c6 100644 --- a/source/blender/editors/sculpt_paint/paint_image_2d.c +++ b/source/blender/editors/sculpt_paint/paint_image_2d.c @@ -26,19 +26,19 @@ #include "MEM_guardedalloc.h" #include "DNA_brush_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_space_types.h" -#include "DNA_object_types.h" +#include "BLI_bitmap.h" #include "BLI_listbase.h" #include "BLI_math_color_blend.h" #include "BLI_stack.h" -#include "BLI_bitmap.h" #include "BLI_task.h" +#include "BKE_brush.h" #include "BKE_colorband.h" #include "BKE_context.h" -#include "BKE_brush.h" #include "BKE_image.h" #include "BKE_paint.h" #include "BKE_report.h" @@ -48,9 +48,9 @@ #include "ED_paint.h" #include "ED_screen.h" +#include "IMB_colormanagement.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "IMB_colormanagement.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index b45e4f81027..8362a4a576a 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -24,9 +24,9 @@ */ #include <float.h> -#include <string.h> -#include <stdio.h> #include <math.h> +#include <stdio.h> +#include <string.h> #include "MEM_guardedalloc.h" @@ -61,8 +61,8 @@ #include "BKE_brush.h" #include "BKE_camera.h" #include "BKE_colorband.h" -#include "BKE_context.h" #include "BKE_colortools.h" +#include "BKE_context.h" #include "BKE_customdata.h" #include "BKE_idprop.h" #include "BKE_image.h" @@ -81,8 +81,8 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "ED_object.h" #include "ED_node.h" +#include "ED_object.h" #include "ED_paint.h" #include "ED_screen.h" #include "ED_uvedit.h" diff --git a/source/blender/editors/sculpt_paint/paint_mask.c b/source/blender/editors/sculpt_paint/paint_mask.c index d6e5559b810..fb8cc3a639b 100644 --- a/source/blender/editors/sculpt_paint/paint_mask.c +++ b/source/blender/editors/sculpt_paint/paint_mask.c @@ -27,17 +27,17 @@ #include "DNA_object_types.h" #include "BLI_bitmap_draw_2d.h" -#include "BLI_math_matrix.h" -#include "BLI_math_geom.h" -#include "BLI_utildefines.h" #include "BLI_lasso_2d.h" +#include "BLI_math_geom.h" +#include "BLI_math_matrix.h" #include "BLI_task.h" +#include "BLI_utildefines.h" -#include "BKE_pbvh.h" #include "BKE_ccg.h" #include "BKE_context.h" #include "BKE_multires.h" #include "BKE_paint.h" +#include "BKE_pbvh.h" #include "BKE_subsurf.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c index 6f0ee3626e4..59a0c50d402 100644 --- a/source/blender/editors/sculpt_paint/paint_ops.c +++ b/source/blender/editors/sculpt_paint/paint_ops.c @@ -20,19 +20,19 @@ #include "MEM_guardedalloc.h" -#include <stdlib.h> #include "BLI_listbase.h" -#include "BLI_utildefines.h" #include "BLI_math_vector.h" #include "BLI_string.h" +#include "BLI_utildefines.h" +#include <stdlib.h> -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" +#include "DNA_brush_types.h" #include "DNA_customdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_brush_types.h" #include "BKE_brush.h" #include "BKE_context.h" @@ -42,13 +42,13 @@ #include "BKE_paint.h" #include "BKE_report.h" +#include "ED_image.h" #include "ED_paint.h" #include "ED_screen.h" -#include "ED_image.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c index 0e194e57538..01a0e8ddd5b 100644 --- a/source/blender/editors/sculpt_paint/paint_stroke.c +++ b/source/blender/editors/sculpt_paint/paint_stroke.c @@ -23,26 +23,26 @@ #include "MEM_guardedalloc.h" +#include "BLI_listbase.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_rand.h" -#include "BLI_listbase.h" +#include "BLI_utildefines.h" #include "PIL_time.h" -#include "DNA_object_types.h" -#include "DNA_scene_types.h" #include "DNA_brush_types.h" #include "DNA_curve_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "RNA_access.h" -#include "BKE_context.h" -#include "BKE_paint.h" #include "BKE_brush.h" -#include "BKE_curve.h" #include "BKE_colortools.h" +#include "BKE_context.h" +#include "BKE_curve.h" #include "BKE_image.h" +#include "BKE_paint.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/sculpt_paint/paint_utils.c b/source/blender/editors/sculpt_paint/paint_utils.c index 77a3aa529e6..e67d43d4571 100644 --- a/source/blender/editors/sculpt_paint/paint_utils.c +++ b/source/blender/editors/sculpt_paint/paint_utils.c @@ -24,19 +24,19 @@ #include <math.h> #include <stdlib.h> +#include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "DNA_material_types.h" -#include "DNA_scene_types.h" #include "DNA_brush_types.h" +#include "DNA_scene_types.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_math_color.h" -#include "BLI_utildefines.h" -#include "BLI_listbase.h" #include "BLI_rect.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -60,13 +60,13 @@ #include "GPU_state.h" #include "IMB_colormanagement.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "RE_render_ext.h" -#include "ED_view3d.h" #include "ED_screen.h" +#include "ED_view3d.h" #include "BLI_sys_types.h" #include "ED_mesh.h" /* for face mask functions */ diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index a00296a911f..604146e2ca6 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -28,23 +28,24 @@ #include "MEM_guardedalloc.h" +#include "BLI_array_utils.h" #include "BLI_listbase.h" -#include "BLI_rect.h" #include "BLI_math.h" -#include "BLI_array_utils.h" +#include "BLI_rect.h" #include "BLI_task.h" +#include "DNA_brush_types.h" #include "DNA_mesh_types.h" +#include "DNA_object_types.h" #include "DNA_particle_types.h" #include "DNA_scene_types.h" -#include "DNA_brush_types.h" -#include "DNA_object_types.h" #include "RNA_access.h" #include "BKE_brush.h" #include "BKE_context.h" #include "BKE_deform.h" +#include "BKE_layer.h" #include "BKE_main.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" @@ -54,29 +55,28 @@ #include "BKE_paint.h" #include "BKE_report.h" #include "BKE_subsurf.h" -#include "BKE_layer.h" #include "DEG_depsgraph.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "ED_armature.h" -#include "ED_object.h" #include "ED_mesh.h" +#include "ED_object.h" #include "ED_screen.h" #include "ED_view3d.h" /* For IMB_BlendMode only. */ #include "IMB_imbuf.h" -#include "bmesh.h" #include "BKE_ccg.h" +#include "bmesh.h" -#include "sculpt_intern.h" #include "paint_intern.h" /* own include */ +#include "sculpt_intern.h" /* -------------------------------------------------------------------- */ /** \name Internal Utilities diff --git a/source/blender/editors/sculpt_paint/paint_vertex_color_ops.c b/source/blender/editors/sculpt_paint/paint_vertex_color_ops.c index 3a4c8f20028..6e706c907dd 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_color_ops.c +++ b/source/blender/editors/sculpt_paint/paint_vertex_color_ops.c @@ -29,8 +29,8 @@ #include "BLI_math_color.h" #include "BKE_context.h" -#include "BKE_mesh.h" #include "BKE_deform.h" +#include "BKE_mesh.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/sculpt_paint/paint_vertex_proj.c b/source/blender/editors/sculpt_paint/paint_vertex_proj.c index e9935ff3eeb..85cd211367a 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_proj.c +++ b/source/blender/editors/sculpt_paint/paint_vertex_proj.c @@ -26,8 +26,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "DNA_mesh_types.h" #include "DNA_object_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 5c408933559..103f312975a 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c +++ b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c @@ -20,13 +20,13 @@ #include "MEM_guardedalloc.h" +#include "BLI_bitmap.h" #include "BLI_blenlib.h" #include "BLI_math.h" -#include "BLI_bitmap.h" +#include "DNA_brush_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_brush_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -35,6 +35,7 @@ #include "RNA_enum_types.h" #include "BKE_brush.h" +#include "BKE_colortools.h" #include "BKE_context.h" #include "BKE_deform.h" #include "BKE_mesh.h" @@ -44,7 +45,6 @@ #include "BKE_object_deform.h" #include "BKE_paint.h" #include "BKE_report.h" -#include "BKE_colortools.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c b/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c index 517bb6324be..5a3067ef193 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c +++ b/source/blender/editors/sculpt_paint/paint_vertex_weight_utils.c @@ -33,9 +33,9 @@ #include "BKE_deform.h" #include "BKE_mesh.h" #include "BKE_modifier.h" +#include "BKE_object.h" #include "BKE_object_deform.h" #include "BKE_report.h" -#include "BKE_object.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 1f05b3b944e..bec44242931 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -24,12 +24,12 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_dial_2d.h" -#include "BLI_gsqueue.h" #include "BLI_ghash.h" +#include "BLI_gsqueue.h" #include "BLI_hash.h" +#include "BLI_math.h" #include "BLI_task.h" #include "BLI_utildefines.h" @@ -37,13 +37,13 @@ #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" -#include "DNA_brush_types.h" #include "BKE_brush.h" #include "BKE_ccg.h" @@ -74,13 +74,13 @@ #include "DEG_depsgraph.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" -#include "ED_sculpt.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_cloth.c b/source/blender/editors/sculpt_paint/sculpt_cloth.c index 431f95d5509..a1ccae7b5ab 100644 --- a/source/blender/editors/sculpt_paint/sculpt_cloth.c +++ b/source/blender/editors/sculpt_paint/sculpt_cloth.c @@ -23,24 +23,24 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_dial_2d.h" -#include "BLI_gsqueue.h" #include "BLI_ghash.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" -#include "DNA_brush_types.h" #include "BKE_brush.h" #include "BKE_ccg.h" @@ -71,13 +71,13 @@ #include "DEG_depsgraph.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" -#include "ED_sculpt.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_intern.h b/source/blender/editors/sculpt_paint/sculpt_intern.h index 4e36ae7aa5e..b8235dc5c95 100644 --- a/source/blender/editors/sculpt_paint/sculpt_intern.h +++ b/source/blender/editors/sculpt_paint/sculpt_intern.h @@ -24,13 +24,13 @@ #ifndef __SCULPT_INTERN_H__ #define __SCULPT_INTERN_H__ +#include "DNA_key_types.h" #include "DNA_listBase.h" #include "DNA_vec_types.h" -#include "DNA_key_types.h" #include "BLI_bitmap.h" -#include "BLI_threads.h" #include "BLI_gsqueue.h" +#include "BLI_threads.h" #include "BKE_paint.h" #include "BKE_pbvh.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.c b/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.c index f2671b66f7f..c74a2ba503a 100644 --- a/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.c +++ b/source/blender/editors/sculpt_paint/sculpt_multiplane_scrape.c @@ -23,14 +23,14 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.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 "DNA_brush_types.h" #include "BKE_brush.h" #include "BKE_ccg.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_pose.c b/source/blender/editors/sculpt_paint/sculpt_pose.c index 57fef1dd4a6..f1c884f9897 100644 --- a/source/blender/editors/sculpt_paint/sculpt_pose.c +++ b/source/blender/editors/sculpt_paint/sculpt_pose.c @@ -23,14 +23,14 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.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 "DNA_brush_types.h" #include "BKE_brush.h" #include "BKE_ccg.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c b/source/blender/editors/sculpt_paint/sculpt_undo.c index 8c80818d12d..af404c64fb0 100644 --- a/source/blender/editors/sculpt_paint/sculpt_undo.c +++ b/source/blender/editors/sculpt_paint/sculpt_undo.c @@ -26,33 +26,33 @@ #include "MEM_guardedalloc.h" +#include "BLI_ghash.h" +#include "BLI_listbase.h" #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_string.h" -#include "BLI_listbase.h" -#include "BLI_ghash.h" #include "BLI_task.h" #include "BLI_threads.h" +#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_mesh_types.h" #include "DNA_screen_types.h" #include "BKE_ccg.h" #include "BKE_context.h" #include "BKE_customdata.h" -#include "BKE_multires.h" -#include "BKE_paint.h" +#include "BKE_global.h" #include "BKE_key.h" +#include "BKE_main.h" #include "BKE_mesh.h" +#include "BKE_multires.h" +#include "BKE_paint.h" #include "BKE_scene.h" -#include "BKE_subsurf.h" #include "BKE_subdiv_ccg.h" +#include "BKE_subsurf.h" #include "BKE_undo_system.h" -#include "BKE_global.h" -#include "BKE_main.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.c b/source/blender/editors/sculpt_paint/sculpt_uv.c index b652c509db9..f364c174f0f 100644 --- a/source/blender/editors/sculpt_paint/sculpt_uv.c +++ b/source/blender/editors/sculpt_paint/sculpt_uv.c @@ -24,14 +24,14 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" -#include "BLI_math.h" #include "BLI_ghash.h" +#include "BLI_math.h" +#include "BLI_utildefines.h" -#include "DNA_object_types.h" -#include "DNA_scene_types.h" #include "DNA_brush_types.h" #include "DNA_meshdata_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BKE_brush.h" #include "BKE_colortools.h" @@ -43,9 +43,9 @@ #include "DEG_depsgraph.h" -#include "ED_screen.h" #include "ED_image.h" #include "ED_mesh.h" +#include "ED_screen.h" #include "WM_api.h" #include "WM_types.h" |