diff options
Diffstat (limited to 'source/blender/editors/object')
23 files changed, 132 insertions, 132 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 832854ec4cc..576e8e0ec25 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -21,9 +21,9 @@ * \ingroup edobj */ +#include <ctype.h> #include <stdlib.h> #include <string.h> -#include <ctype.h> #include "MEM_guardedalloc.h" @@ -31,24 +31,24 @@ #include "DNA_camera_types.h" #include "DNA_collection_types.h" #include "DNA_curve_types.h" -#include "DNA_light_types.h" +#include "DNA_gpencil_types.h" #include "DNA_key_types.h" +#include "DNA_light_types.h" +#include "DNA_lightprobe_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" #include "DNA_object_fluidsim_types.h" #include "DNA_object_force_types.h" #include "DNA_object_types.h" -#include "DNA_lightprobe_types.h" #include "DNA_scene_types.h" #include "DNA_vfont_types.h" -#include "DNA_gpencil_types.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_string.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -58,8 +58,8 @@ #include "BKE_armature.h" #include "BKE_camera.h" #include "BKE_collection.h" -#include "BKE_context.h" #include "BKE_constraint.h" +#include "BKE_context.h" #include "BKE_curve.h" #include "BKE_displist.h" #include "BKE_effect.h" @@ -67,12 +67,12 @@ #include "BKE_gpencil.h" #include "BKE_hair.h" #include "BKE_key.h" -#include "BKE_light.h" #include "BKE_lattice.h" #include "BKE_layer.h" #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_lib_remap.h" +#include "BKE_light.h" #include "BKE_lightprobe.h" #include "BKE_main.h" #include "BKE_material.h" diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c index 6f659858ac2..2cb0229126d 100644 --- a/source/blender/editors/object/object_bake.c +++ b/source/blender/editors/object/object_bake.c @@ -25,40 +25,40 @@ #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_screen_types.h" #include "DNA_space_types.h" #include "DNA_world_types.h" -#include "DNA_object_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "BLI_blenlib.h" #include "BLI_utildefines.h" +#include "BKE_DerivedMesh.h" #include "BKE_blender.h" +#include "BKE_cdderivedmesh.h" #include "BKE_context.h" #include "BKE_global.h" #include "BKE_image.h" #include "BKE_material.h" +#include "BKE_mesh.h" +#include "BKE_modifier.h" #include "BKE_multires.h" #include "BKE_report.h" -#include "BKE_cdderivedmesh.h" -#include "BKE_modifier.h" -#include "BKE_DerivedMesh.h" -#include "BKE_mesh.h" #include "BKE_scene.h" #include "DEG_depsgraph.h" +#include "RE_multires_bake.h" #include "RE_pipeline.h" #include "RE_shader_ext.h" -#include "RE_multires_bake.h" #include "PIL_time.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "GPU_draw.h" /* GPU_free_image */ diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c index 8cfcad2d77e..7d39d2546b6 100644 --- a/source/blender/editors/object/object_bake_api.c +++ b/source/blender/editors/object/object_bake_api.c @@ -23,16 +23,16 @@ #include "MEM_guardedalloc.h" -#include "DNA_object_types.h" -#include "DNA_mesh_types.h" #include "DNA_material_types.h" +#include "DNA_mesh_types.h" +#include "DNA_object_types.h" #include "RNA_access.h" #include "RNA_define.h" #include "RNA_enum_types.h" -#include "BLI_listbase.h" #include "BLI_fileops.h" +#include "BLI_listbase.h" #include "BLI_path_util.h" #include "BKE_context.h" @@ -57,9 +57,9 @@ #include "RE_engine.h" #include "RE_pipeline.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "IMB_colormanagement.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/object/object_collection.c b/source/blender/editors/object/object_collection.c index a278ce90eda..7c12a4839f0 100644 --- a/source/blender/editors/object/object_collection.c +++ b/source/blender/editors/object/object_collection.c @@ -40,8 +40,8 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "ED_screen.h" #include "ED_object.h" +#include "ED_screen.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c index 4db7ee9594e..d9fb48afcbf 100644 --- a/source/blender/editors/object/object_constraint.c +++ b/source/blender/editors/object/object_constraint.c @@ -27,8 +27,8 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_math.h" #include "BLI_dynstr.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLT_translation.h" @@ -37,10 +37,11 @@ #include "DNA_armature_types.h" #include "DNA_constraint_types.h" #include "DNA_curve_types.h" +#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_text_types.h" -#include "DNA_object_types.h" +#include "BIK_api.h" #include "BKE_action.h" #include "BKE_armature.h" #include "BKE_constraint.h" @@ -50,7 +51,6 @@ #include "BKE_object.h" #include "BKE_report.h" #include "BKE_tracking.h" -#include "BIK_api.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" @@ -67,8 +67,8 @@ #include "RNA_define.h" #include "RNA_enum_types.h" -#include "ED_object.h" #include "ED_keyframing.h" +#include "ED_object.h" #include "ED_screen.h" #include "UI_interface.h" diff --git a/source/blender/editors/object/object_data_transfer.c b/source/blender/editors/object/object_data_transfer.c index 0a5db782892..1e2b7702dc5 100644 --- a/source/blender/editors/object/object_data_transfer.c +++ b/source/blender/editors/object/object_data_transfer.c @@ -26,8 +26,8 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "BKE_context.h" diff --git a/source/blender/editors/object/object_data_transform.c b/source/blender/editors/object/object_data_transform.c index 6d03ec2774c..fc91cbb9666 100644 --- a/source/blender/editors/object/object_data_transform.c +++ b/source/blender/editors/object/object_data_transform.c @@ -32,23 +32,23 @@ #include "DNA_anim_types.h" #include "DNA_armature_types.h" +#include "DNA_collection_types.h" +#include "DNA_lattice_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_collection_types.h" -#include "DNA_lattice_types.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_utildefines.h" +#include "BKE_armature.h" #include "BKE_curve.h" #include "BKE_editmesh.h" +#include "BKE_lattice.h" #include "BKE_mball.h" #include "BKE_mesh.h" -#include "BKE_armature.h" -#include "BKE_lattice.h" #include "BKE_scene.h" #include "bmesh.h" @@ -58,9 +58,9 @@ #include "WM_types.h" -#include "ED_object.h" -#include "ED_mesh.h" #include "ED_armature.h" +#include "ED_mesh.h" +#include "ED_object.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index def93db2537..7faad5cdd0e 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -21,19 +21,19 @@ * \ingroup edobj */ +#include <ctype.h> +#include <float.h> +#include <math.h> +#include <stddef.h> //for offsetof #include <stdlib.h> #include <string.h> -#include <math.h> #include <time.h> -#include <float.h> -#include <ctype.h> -#include <stddef.h> //for offsetof #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BLI_utildefines.h" #include "BLI_ghash.h" +#include "BLI_utildefines.h" #include "BLT_translation.h" @@ -41,15 +41,15 @@ #include "DNA_collection_types.h" #include "DNA_curve_types.h" #include "DNA_gpencil_types.h" +#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_scene_types.h" -#include "DNA_object_types.h" #include "DNA_object_force_types.h" -#include "DNA_meshdata_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "DNA_vfont_types.h" -#include "DNA_mesh_types.h" -#include "DNA_lattice_types.h" #include "DNA_workspace_types.h" #include "IMB_imbuf_types.h" @@ -60,6 +60,7 @@ #include "BKE_context.h" #include "BKE_curve.h" #include "BKE_editlattice.h" +#include "BKE_editmesh.h" #include "BKE_effect.h" #include "BKE_global.h" #include "BKE_image.h" @@ -74,10 +75,9 @@ #include "BKE_paint.h" #include "BKE_particle.h" #include "BKE_pointcache.h" -#include "BKE_softbody.h" -#include "BKE_editmesh.h" #include "BKE_report.h" #include "BKE_scene.h" +#include "BKE_softbody.h" #include "BKE_workspace.h" #include "DEG_depsgraph.h" @@ -86,15 +86,15 @@ #include "ED_anim_api.h" #include "ED_armature.h" #include "ED_curve.h" -#include "ED_mesh.h" -#include "ED_mball.h" +#include "ED_gpencil.h" +#include "ED_image.h" #include "ED_lattice.h" +#include "ED_mball.h" +#include "ED_mesh.h" #include "ED_object.h" #include "ED_outliner.h" #include "ED_screen.h" #include "ED_undo.h" -#include "ED_image.h" -#include "ED_gpencil.h" #include "RNA_access.h" #include "RNA_define.h" @@ -106,9 +106,9 @@ #include "UI_resources.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "object_intern.h" // own include diff --git a/source/blender/editors/object/object_facemap_ops.c b/source/blender/editors/object/object_facemap_ops.c index 0081e18f33c..147bd3d7871 100644 --- a/source/blender/editors/object/object_facemap_ops.c +++ b/source/blender/editors/object/object_facemap_ops.c @@ -25,27 +25,27 @@ #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" #include "BLI_listbase.h" +#include "BLI_utildefines.h" -#include "DNA_object_types.h" #include "DNA_mesh_types.h" +#include "DNA_object_types.h" #include "DNA_workspace_types.h" #include "BKE_context.h" #include "BKE_customdata.h" #include "BKE_editmesh.h" #include "BKE_object.h" -#include "BKE_object_facemap.h" #include "BKE_object_deform.h" +#include "BKE_object_facemap.h" #include "DEG_depsgraph.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "ED_mesh.h" #include "ED_object.h" diff --git a/source/blender/editors/object/object_gpencil_modifier.c b/source/blender/editors/object/object_gpencil_modifier.c index 4543f1a19b3..5bf5c4bd95a 100644 --- a/source/blender/editors/object/object_gpencil_modifier.c +++ b/source/blender/editors/object/object_gpencil_modifier.c @@ -27,8 +27,8 @@ #include "MEM_guardedalloc.h" -#include "DNA_gpencil_types.h" #include "DNA_gpencil_modifier_types.h" +#include "DNA_gpencil_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -37,11 +37,11 @@ #include "BLI_utildefines.h" #include "BKE_context.h" -#include "BKE_main.h" +#include "BKE_gpencil.h" #include "BKE_gpencil_modifier.h" -#include "BKE_report.h" +#include "BKE_main.h" #include "BKE_object.h" -#include "BKE_gpencil.h" +#include "BKE_report.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c index 3c722ffc749..4414acff115 100644 --- a/source/blender/editors/object/object_hook.c +++ b/source/blender/editors/object/object_hook.c @@ -26,8 +26,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_string.h" #include "BLI_utildefines.h" @@ -41,29 +41,29 @@ #include "BKE_action.h" #include "BKE_context.h" +#include "BKE_deform.h" +#include "BKE_editmesh.h" #include "BKE_layer.h" #include "BKE_main.h" #include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_deform.h" -#include "BKE_editmesh.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" #include "DEG_depsgraph_query.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "RNA_enum_types.h" #include "ED_curve.h" #include "ED_mesh.h" #include "ED_screen.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "UI_resources.h" diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index 7c74213608c..f2629b0b02f 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -37,17 +37,17 @@ #include "DNA_scene_types.h" #include "BLI_bitmap.h" -#include "BLI_math.h" #include "BLI_listbase.h" +#include "BLI_math.h" +#include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_string_utf8.h" -#include "BLI_path_util.h" #include "BLI_utildefines.h" +#include "BKE_DerivedMesh.h" #include "BKE_animsys.h" -#include "BKE_curve.h" #include "BKE_context.h" -#include "BKE_DerivedMesh.h" +#include "BKE_curve.h" #include "BKE_displist.h" #include "BKE_editmesh.h" #include "BKE_effect.h" @@ -83,9 +83,9 @@ #include "RNA_enum_types.h" #include "ED_armature.h" +#include "ED_mesh.h" #include "ED_object.h" #include "ED_screen.h" -#include "ED_mesh.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c index 52273b887dd..cacf7b67777 100644 --- a/source/blender/editors/object/object_ops.c +++ b/source/blender/editors/object/object_ops.c @@ -21,8 +21,8 @@ * \ingroup edobj */ -#include <stdlib.h> #include <math.h> +#include <stdlib.h> #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -37,9 +37,9 @@ #include "WM_api.h" #include "WM_types.h" +#include "ED_object.h" #include "ED_screen.h" #include "ED_select_utils.h" -#include "ED_object.h" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 836e3bf7a44..f86ad1216cb 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -33,8 +33,8 @@ #include "DNA_collection_types.h" #include "DNA_constraint_types.h" #include "DNA_gpencil_types.h" -#include "DNA_light_types.h" #include "DNA_lattice_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" @@ -44,37 +44,37 @@ #include "DNA_vfont_types.h" #include "DNA_world_types.h" -#include "BLI_math.h" -#include "BLI_listbase.h" +#include "BLI_kdtree.h" #include "BLI_linklist.h" +#include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_string.h" -#include "BLI_kdtree.h" #include "BLI_utildefines.h" #include "BLT_translation.h" +#include "BKE_DerivedMesh.h" #include "BKE_action.h" #include "BKE_animsys.h" #include "BKE_armature.h" #include "BKE_camera.h" #include "BKE_collection.h" -#include "BKE_context.h" #include "BKE_constraint.h" +#include "BKE_context.h" #include "BKE_curve.h" -#include "BKE_DerivedMesh.h" #include "BKE_displist.h" #include "BKE_editmesh.h" -#include "BKE_gpencil.h" #include "BKE_fcurve.h" +#include "BKE_gpencil.h" #include "BKE_hair.h" #include "BKE_idprop.h" -#include "BKE_light.h" #include "BKE_lattice.h" #include "BKE_layer.h" #include "BKE_lib_id.h" #include "BKE_lib_override.h" #include "BKE_lib_query.h" #include "BKE_lib_remap.h" +#include "BKE_light.h" #include "BKE_lightprobe.h" #include "BKE_main.h" #include "BKE_material.h" @@ -108,8 +108,8 @@ #include "ED_curve.h" #include "ED_gpencil.h" #include "ED_keyframing.h" -#include "ED_object.h" #include "ED_mesh.h" +#include "ED_object.h" #include "ED_screen.h" #include "ED_view3d.h" diff --git a/source/blender/editors/object/object_remesh.c b/source/blender/editors/object/object_remesh.c index 631cd961e66..a9f2319d926 100644 --- a/source/blender/editors/object/object_remesh.c +++ b/source/blender/editors/object/object_remesh.c @@ -21,11 +21,11 @@ * \ingroup edobj */ +#include <ctype.h> +#include <float.h> +#include <math.h> #include <stdlib.h> #include <string.h> -#include <math.h> -#include <float.h> -#include <ctype.h> #include "MEM_guardedalloc.h" @@ -33,26 +33,26 @@ #include "BLI_math.h" #include "BLI_utildefines.h" -#include "DNA_scene_types.h" -#include "DNA_object_types.h" -#include "DNA_meshdata_types.h" #include "DNA_mesh_types.h" +#include "DNA_meshdata_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" #include "BKE_context.h" +#include "BKE_customdata.h" #include "BKE_global.h" #include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_mesh.h" -#include "BKE_mesh_runtime.h" #include "BKE_mesh_mirror.h" +#include "BKE_mesh_remesh_voxel.h" +#include "BKE_mesh_runtime.h" #include "BKE_modifier.h" #include "BKE_object.h" #include "BKE_paint.h" #include "BKE_report.h" #include "BKE_scene.h" #include "BKE_shrinkwrap.h" -#include "BKE_customdata.h" -#include "BKE_mesh_remesh_voxel.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" @@ -68,9 +68,9 @@ #include "RNA_enum_types.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" #include "WM_toolsystem.h" +#include "WM_types.h" #include "object_intern.h" // own include diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c index 29b2ba59ee9..8f01adb202e 100644 --- a/source/blender/editors/object/object_select.c +++ b/source/blender/editors/object/object_select.c @@ -27,18 +27,18 @@ #include <string.h> #include "DNA_anim_types.h" +#include "DNA_armature_types.h" #include "DNA_collection_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_light_types.h" #include "DNA_material_types.h" #include "DNA_modifier_types.h" #include "DNA_scene_types.h" -#include "DNA_armature_types.h" -#include "DNA_light_types.h" #include "DNA_workspace_types.h" -#include "DNA_gpencil_types.h" +#include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_math_bits.h" -#include "BLI_listbase.h" #include "BLI_rand.h" #include "BLI_string_utils.h" #include "BLI_utildefines.h" @@ -64,15 +64,15 @@ #include "DEG_depsgraph.h" #include "WM_api.h" -#include "WM_types.h" #include "WM_message.h" +#include "WM_types.h" #include "ED_armature.h" +#include "ED_keyframing.h" #include "ED_object.h" #include "ED_outliner.h" #include "ED_screen.h" #include "ED_select_utils.h" -#include "ED_keyframing.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/object/object_shader_fx.c b/source/blender/editors/object/object_shader_fx.c index db0c8c54186..cd71ab674ba 100644 --- a/source/blender/editors/object/object_shader_fx.c +++ b/source/blender/editors/object/object_shader_fx.c @@ -28,9 +28,9 @@ #include "MEM_guardedalloc.h" #include "DNA_gpencil_types.h" -#include "DNA_shader_fx_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "DNA_shader_fx_types.h" #include "BLI_listbase.h" #include "BLI_string_utf8.h" @@ -40,9 +40,9 @@ #include "BKE_context.h" #include "BKE_main.h" -#include "BKE_shader_fx.h" -#include "BKE_report.h" #include "BKE_object.h" +#include "BKE_report.h" +#include "BKE_shader_fx.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/object/object_shapekey.c b/source/blender/editors/object/object_shapekey.c index fb76ba6099d..abce985b65a 100644 --- a/source/blender/editors/object/object_shapekey.c +++ b/source/blender/editors/object/object_shapekey.c @@ -55,8 +55,8 @@ #include "BLI_sys_types.h" // for intptr_t support -#include "ED_object.h" #include "ED_mesh.h" +#include "ED_object.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index 4a085bb61bf..a467667a4c7 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -26,54 +26,54 @@ #include "DNA_anim_types.h" #include "DNA_armature_types.h" +#include "DNA_collection_types.h" +#include "DNA_gpencil_types.h" +#include "DNA_lattice_types.h" +#include "DNA_light_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" -#include "DNA_light_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_collection_types.h" -#include "DNA_lattice_types.h" -#include "BLI_math.h" +#include "BLI_array.h" #include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_utildefines.h" -#include "BLI_array.h" +#include "BKE_armature.h" #include "BKE_context.h" #include "BKE_curve.h" -#include "BKE_main.h" +#include "BKE_editmesh.h" +#include "BKE_gpencil.h" #include "BKE_idcode.h" +#include "BKE_lattice.h" #include "BKE_layer.h" +#include "BKE_lib_id.h" +#include "BKE_main.h" #include "BKE_mball.h" #include "BKE_mesh.h" +#include "BKE_multires.h" #include "BKE_object.h" -#include "BKE_scene.h" #include "BKE_report.h" -#include "BKE_editmesh.h" -#include "BKE_multires.h" -#include "BKE_armature.h" -#include "BKE_lattice.h" -#include "BKE_lib_id.h" +#include "BKE_scene.h" #include "BKE_tracking.h" -#include "BKE_gpencil.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "RNA_define.h" #include "RNA_access.h" +#include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" #include "ED_armature.h" +#include "ED_gpencil.h" #include "ED_keyframing.h" #include "ED_mesh.h" +#include "ED_object.h" #include "ED_screen.h" #include "ED_view3d.h" -#include "ED_gpencil.h" -#include "ED_object.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/object/object_utils.c b/source/blender/editors/object/object_utils.c index ed764f4dcfc..d6056f85932 100644 --- a/source/blender/editors/object/object_utils.c +++ b/source/blender/editors/object/object_utils.c @@ -23,10 +23,10 @@ #include "DNA_anim_types.h" #include "DNA_armature_types.h" +#include "DNA_collection_types.h" #include "DNA_meta_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_collection_types.h" #include "BLI_math.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index c11b3aebe72..3ec55d42849 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -21,17 +21,17 @@ * \ingroup edobj */ -#include <string.h> -#include <stddef.h> -#include <math.h> #include <assert.h> +#include <math.h> +#include <stddef.h> +#include <string.h> #include "MEM_guardedalloc.h" #include "DNA_curve_types.h" #include "DNA_lattice_types.h" -#include "DNA_meshdata_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" @@ -39,24 +39,24 @@ #include "BLI_alloca.h" #include "BLI_array.h" -#include "BLI_math.h" #include "BLI_blenlib.h" +#include "BLI_math.h" #include "BLI_utildefines.h" #include "BLI_utildefines_stack.h" #include "BKE_context.h" #include "BKE_customdata.h" #include "BKE_deform.h" +#include "BKE_editmesh.h" +#include "BKE_lattice.h" +#include "BKE_layer.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" #include "BKE_mesh_runtime.h" -#include "BKE_editmesh.h" -#include "BKE_layer.h" #include "BKE_modifier.h" -#include "BKE_report.h" -#include "BKE_object_deform.h" #include "BKE_object.h" -#include "BKE_lattice.h" +#include "BKE_object_deform.h" +#include "BKE_report.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" @@ -70,8 +70,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_object.h" #include "ED_mesh.h" +#include "ED_object.h" #include "UI_resources.h" diff --git a/source/blender/editors/object/object_volume.c b/source/blender/editors/object/object_volume.c index 64482a0bcf6..92fb0788f6b 100644 --- a/source/blender/editors/object/object_volume.c +++ b/source/blender/editors/object/object_volume.c @@ -43,8 +43,8 @@ #include "BKE_report.h" #include "BKE_volume.h" -#include "WM_types.h" #include "WM_api.h" +#include "WM_types.h" #include "ED_image.h" #include "ED_object.h" diff --git a/source/blender/editors/object/object_warp.c b/source/blender/editors/object/object_warp.c index 836e38e3676..00f9330c8a7 100644 --- a/source/blender/editors/object/object_warp.c +++ b/source/blender/editors/object/object_warp.c @@ -35,8 +35,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_view3d.h" #include "ED_transverts.h" +#include "ED_view3d.h" #include "object_intern.h" |