diff options
205 files changed, 15 insertions, 1623 deletions
diff --git a/source/blender/editors/animation/fmodifier_ui.c b/source/blender/editors/animation/fmodifier_ui.c index 5cc5deb2eae..5f800e0f6c2 100644 --- a/source/blender/editors/animation/fmodifier_ui.c +++ b/source/blender/editors/animation/fmodifier_ui.c @@ -52,7 +52,6 @@ #include "RNA_access.h" -#include "ED_anim_api.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c index 69f9583ed33..32e5e0b2bdb 100644 --- a/source/blender/editors/animation/keyframes_draw.c +++ b/source/blender/editors/animation/keyframes_draw.c @@ -44,16 +44,11 @@ #include "BLI_math.h" #include "BLI_dlrbTree.h" -#include "DNA_listBase.h" #include "DNA_anim_types.h" -#include "DNA_action_types.h" #include "DNA_armature_types.h" #include "DNA_camera_types.h" -#include "DNA_curve_types.h" #include "DNA_object_types.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" -#include "DNA_space_types.h" #include "DNA_key_types.h" #include "DNA_lamp_types.h" #include "DNA_mesh_types.h" @@ -61,11 +56,7 @@ #include "DNA_meta_types.h" #include "DNA_node_types.h" #include "DNA_particle_types.h" -#include "DNA_userdef_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_windowmanager_types.h" #include "DNA_world_types.h" -#include "DNA_view2d_types.h" #include "BKE_action.h" #include "BKE_depsgraph.h" @@ -80,8 +71,6 @@ #include "BIF_gl.h" #include "BIF_glutil.h" -#include "UI_interface.h" -#include "UI_interface_icons.h" #include "UI_resources.h" #include "UI_view2d.h" diff --git a/source/blender/editors/animation/keyframes_edit.c b/source/blender/editors/animation/keyframes_edit.c index 068278de1d3..13c236b0cce 100644 --- a/source/blender/editors/animation/keyframes_edit.c +++ b/source/blender/editors/animation/keyframes_edit.c @@ -35,10 +35,8 @@ #include "BLI_math.h" #include "DNA_anim_types.h" -#include "DNA_action_types.h" #include "DNA_armature_types.h" #include "DNA_camera_types.h" -#include "DNA_curve_types.h" #include "DNA_key_types.h" #include "DNA_lamp_types.h" #include "DNA_mesh_types.h" @@ -47,7 +45,6 @@ #include "DNA_meta_types.h" #include "DNA_node_types.h" #include "DNA_particle_types.h" -#include "DNA_space_types.h" #include "DNA_scene_types.h" #include "DNA_world_types.h" diff --git a/source/blender/editors/animation/keyframes_general.c b/source/blender/editors/animation/keyframes_general.c index f836d7117e8..91a8b7047c4 100644 --- a/source/blender/editors/animation/keyframes_general.c +++ b/source/blender/editors/animation/keyframes_general.c @@ -36,14 +36,9 @@ #include "BLI_math.h" #include "DNA_anim_types.h" -#include "DNA_action_types.h" -#include "DNA_curve_types.h" -#include "DNA_key_types.h" #include "DNA_object_types.h" -#include "DNA_space_types.h" #include "DNA_scene_types.h" -#include "RNA_access.h" #include "BKE_action.h" #include "BKE_fcurve.h" diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index eaebab2efab..5b8f9418a04 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -40,15 +40,11 @@ #include "BLI_dynstr.h" #include "DNA_anim_types.h" -#include "DNA_action_types.h" #include "DNA_armature_types.h" #include "DNA_constraint_types.h" #include "DNA_key_types.h" -#include "DNA_object_types.h" #include "DNA_material_types.h" #include "DNA_scene_types.h" -#include "DNA_userdef_types.h" -#include "DNA_windowmanager_types.h" #include "BKE_animsys.h" #include "BKE_action.h" @@ -67,7 +63,6 @@ #include "ED_keyframing.h" #include "ED_keyframes_edit.h" #include "ED_screen.h" -#include "ED_util.h" #include "UI_interface.h" @@ -76,7 +71,6 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "RNA_types.h" #include "anim_intern.h" diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c index db9f5b4b97d..f7a4fe69d26 100644 --- a/source/blender/editors/animation/keyingsets.c +++ b/source/blender/editors/animation/keyingsets.c @@ -40,15 +40,8 @@ #include "BLI_dynstr.h" #include "DNA_anim_types.h" -#include "DNA_action_types.h" -#include "DNA_armature_types.h" #include "DNA_constraint_types.h" -#include "DNA_key_types.h" -#include "DNA_object_types.h" -#include "DNA_material_types.h" #include "DNA_scene_types.h" -#include "DNA_userdef_types.h" -#include "DNA_windowmanager_types.h" #include "BKE_animsys.h" #include "BKE_action.h" @@ -61,11 +54,7 @@ #include "BKE_key.h" #include "BKE_material.h" -#include "ED_anim_api.h" #include "ED_keyframing.h" -#include "ED_keyframes_edit.h" -#include "ED_screen.h" -#include "ED_util.h" #include "UI_interface.h" @@ -74,7 +63,6 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "RNA_types.h" #include "anim_intern.h" diff --git a/source/blender/editors/armature/armature_ops.c b/source/blender/editors/armature/armature_ops.c index 508ab19ca17..701332996aa 100644 --- a/source/blender/editors/armature/armature_ops.c +++ b/source/blender/editors/armature/armature_ops.c @@ -31,13 +31,6 @@ #include "MEM_guardedalloc.h" -#include "DNA_object_types.h" -#include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" -#include "DNA_userdef_types.h" -#include "DNA_view3d_types.h" -#include "DNA_windowmanager_types.h" #include "BLI_math.h" #include "BLI_blenlib.h" @@ -47,14 +40,12 @@ #include "BKE_utildefines.h" #include "RNA_access.h" -#include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" #include "ED_armature.h" #include "ED_screen.h" -#include "ED_object.h" #include "ED_transform.h" #include "armature_intern.h" diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index f95205e7252..e19da91b2a2 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -34,22 +34,10 @@ #include "MEM_guardedalloc.h" #include "DNA_anim_types.h" -#include "DNA_action_types.h" #include "DNA_armature_types.h" #include "DNA_constraint_types.h" -#include "DNA_ID.h" -#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_nla_types.h" -#include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" -#include "DNA_userdef_types.h" -#include "DNA_view3d_types.h" -#include "DNA_modifier_types.h" -#include "DNA_ipo_types.h" -#include "DNA_curve_types.h" #include "BLI_blenlib.h" #include "BLI_math.h" @@ -72,7 +60,6 @@ #include "BKE_subsurf.h" #include "BKE_utildefines.h" #include "BKE_modifier.h" -#include "PIL_time.h" #include "BIF_gl.h" #include "BIF_generate.h" @@ -88,7 +75,6 @@ #include "ED_mesh.h" #include "ED_object.h" #include "ED_screen.h" -#include "ED_transform.h" #include "ED_util.h" #include "ED_view3d.h" diff --git a/source/blender/editors/armature/editarmature_generate.c b/source/blender/editors/armature/editarmature_generate.c index b92e1652b4e..a7f79bb6ff3 100644 --- a/source/blender/editors/armature/editarmature_generate.c +++ b/source/blender/editors/armature/editarmature_generate.c @@ -34,7 +34,6 @@ #include "MEM_guardedalloc.h" -#include "DNA_listBase.h" #include "DNA_scene_types.h" #include "DNA_armature_types.h" diff --git a/source/blender/editors/armature/editarmature_retarget.c b/source/blender/editors/armature/editarmature_retarget.c index 6eaa76d6422..57224428476 100644 --- a/source/blender/editors/armature/editarmature_retarget.c +++ b/source/blender/editors/armature/editarmature_retarget.c @@ -37,15 +37,9 @@ #include "PIL_time.h" -#include "DNA_ID.h" -#include "DNA_action_types.h" #include "DNA_armature_types.h" #include "DNA_constraint_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" -#include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_view3d_types.h" #include "BLI_blenlib.h" #include "BLI_math.h" @@ -68,7 +62,6 @@ #include "BIF_retarget.h" -#include "PIL_time.h" //#include "mydevice.h" #include "reeb.h" // FIX ME diff --git a/source/blender/editors/armature/editarmature_sketch.c b/source/blender/editors/armature/editarmature_sketch.c index 6d1d26865af..e9ad91c19e3 100644 --- a/source/blender/editors/armature/editarmature_sketch.c +++ b/source/blender/editors/armature/editarmature_sketch.c @@ -26,14 +26,8 @@ #include "MEM_guardedalloc.h" -#include "DNA_listBase.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_view3d_types.h" -#include "DNA_meshdata_types.h" -#include "DNA_object_types.h" #include "DNA_armature_types.h" -#include "DNA_userdef_types.h" #include "RNA_define.h" #include "RNA_access.h" @@ -55,7 +49,6 @@ #include "ED_screen.h" #include "BIF_gl.h" -#include "UI_resources.h" //#include "BIF_screen.h" //#include "BIF_space.h" //#include "BIF_mywindow.h" diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c index e352b03f4ba..136027b1504 100644 --- a/source/blender/editors/armature/meshlaplacian.c +++ b/source/blender/editors/armature/meshlaplacian.c @@ -33,7 +33,6 @@ #include "MEM_guardedalloc.h" -#include "DNA_listBase.h" #include "DNA_object_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" @@ -58,7 +57,6 @@ #include "BLO_sys_types.h" // for intptr_t support -#include "ED_armature.h" #include "ED_mesh.h" #include "meshlaplacian.h" diff --git a/source/blender/editors/armature/poseSlide.c b/source/blender/editors/armature/poseSlide.c index 1aa7ea07078..21b99bc10c0 100644 --- a/source/blender/editors/armature/poseSlide.c +++ b/source/blender/editors/armature/poseSlide.c @@ -39,15 +39,10 @@ #include "BLI_dynstr.h" #include "BLI_dlrbTree.h" -#include "DNA_listBase.h" #include "DNA_anim_types.h" -#include "DNA_action_types.h" #include "DNA_armature_types.h" -#include "DNA_curve_types.h" #include "DNA_object_types.h" -#include "DNA_object_force.h" #include "DNA_scene_types.h" -#include "DNA_userdef_types.h" #include "BKE_animsys.h" #include "BKE_action.h" @@ -63,21 +58,15 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "RNA_types.h" #include "WM_api.h" #include "WM_types.h" -#include "UI_interface.h" -#include "UI_resources.h" #include "BIF_gl.h" -#include "ED_anim_api.h" #include "ED_armature.h" #include "ED_keyframes_draw.h" -#include "ED_keyframing.h" -#include "ED_keyframes_edit.h" #include "ED_screen.h" #include "armature_intern.h" diff --git a/source/blender/editors/armature/poseUtils.c b/source/blender/editors/armature/poseUtils.c index d40f3f30bb2..c9a80318050 100644 --- a/source/blender/editors/armature/poseUtils.c +++ b/source/blender/editors/armature/poseUtils.c @@ -39,15 +39,10 @@ #include "BLI_dynstr.h" #include "BLI_dlrbTree.h" -#include "DNA_listBase.h" #include "DNA_anim_types.h" -#include "DNA_action_types.h" #include "DNA_armature_types.h" -#include "DNA_curve_types.h" #include "DNA_object_types.h" -#include "DNA_object_force.h" #include "DNA_scene_types.h" -#include "DNA_userdef_types.h" #include "BKE_animsys.h" #include "BKE_action.h" @@ -62,23 +57,15 @@ #include "BKE_utildefines.h" #include "RNA_access.h" -#include "RNA_define.h" -#include "RNA_types.h" #include "WM_api.h" #include "WM_types.h" -#include "UI_interface.h" -#include "UI_resources.h" #include "BIF_gl.h" -#include "ED_anim_api.h" #include "ED_armature.h" -#include "ED_keyframes_draw.h" #include "ED_keyframing.h" -#include "ED_keyframes_edit.h" -#include "ED_screen.h" #include "armature_intern.h" diff --git a/source/blender/editors/armature/poselib.c b/source/blender/editors/armature/poselib.c index 8d38d0530ce..efc76105083 100644 --- a/source/blender/editors/armature/poselib.c +++ b/source/blender/editors/armature/poselib.c @@ -39,15 +39,10 @@ #include "BLI_dynstr.h" #include "BLI_dlrbTree.h" -#include "DNA_listBase.h" #include "DNA_anim_types.h" -#include "DNA_action_types.h" #include "DNA_armature_types.h" -#include "DNA_curve_types.h" #include "DNA_object_types.h" -#include "DNA_object_force.h" #include "DNA_scene_types.h" -#include "DNA_userdef_types.h" #include "BKE_animsys.h" #include "BKE_action.h" @@ -63,7 +58,6 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "RNA_types.h" #include "RNA_enum_types.h" #include "WM_api.h" diff --git a/source/blender/editors/armature/poseobject.c b/source/blender/editors/armature/poseobject.c index 8a2a1d7d653..102fbe2eafd 100644 --- a/source/blender/editors/armature/poseobject.c +++ b/source/blender/editors/armature/poseobject.c @@ -38,18 +38,9 @@ #include "BLI_dynstr.h" #include "DNA_anim_types.h" -#include "DNA_action_types.h" #include "DNA_armature_types.h" #include "DNA_constraint_types.h" -#include "DNA_curve_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" -#include "DNA_screen_types.h" -#include "DNA_view3d_types.h" -#include "DNA_userdef_types.h" #include "BKE_anim.h" #include "BKE_idprop.h" @@ -78,13 +69,9 @@ #include "WM_types.h" #include "ED_armature.h" -#include "ED_anim_api.h" #include "ED_keyframing.h" -#include "ED_object.h" #include "ED_mesh.h" #include "ED_screen.h" -#include "ED_transform.h" /* for autokey TFM_TRANSLATION, etc */ -#include "ED_view3d.h" #include "UI_interface.h" diff --git a/source/blender/editors/armature/reeb.c b/source/blender/editors/armature/reeb.c index ef5d566d0e8..04bf5bce553 100644 --- a/source/blender/editors/armature/reeb.c +++ b/source/blender/editors/armature/reeb.c @@ -31,14 +31,9 @@ #include <stdlib.h> // for qsort #include <float.h> -#include "PIL_time.h" -#include "DNA_listBase.h" #include "DNA_scene_types.h" -#include "DNA_space_types.h" #include "DNA_object_types.h" -#include "DNA_meshdata_types.h" -#include "DNA_armature_types.h" #include "BKE_context.h" @@ -53,13 +48,10 @@ //#include "BDR_editobject.h" -#include "ED_mesh.h" -#include "ED_armature.h" //#include "BIF_interface.h" //#include "BIF_toolbox.h" //#include "BIF_graphics.h" #include "BIF_gl.h" -#include "UI_resources.h" #include "BKE_global.h" #include "BKE_utildefines.h" diff --git a/source/blender/editors/curve/curve_ops.c b/source/blender/editors/curve/curve_ops.c index 3f4498e83fe..18652bf3716 100644 --- a/source/blender/editors/curve/curve_ops.c +++ b/source/blender/editors/curve/curve_ops.c @@ -32,13 +32,6 @@ #include "MEM_guardedalloc.h" #include "DNA_curve_types.h" -#include "DNA_object_types.h" -#include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" -#include "DNA_userdef_types.h" -#include "DNA_view3d_types.h" -#include "DNA_windowmanager_types.h" #include "BLI_math.h" #include "BLI_blenlib.h" @@ -48,7 +41,6 @@ #include "BKE_utildefines.h" #include "RNA_access.h" -#include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" @@ -57,7 +49,6 @@ #include "ED_screen.h" #include "ED_transform.h" -#include "UI_interface.h" #include "curve_intern.h" diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 17b1e9e737d..0e3bd2f1051 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -43,15 +43,9 @@ #include "BLI_dynstr.h" #include "BLI_rand.h" -#include "DNA_curve_types.h" #include "DNA_key_types.h" -#include "DNA_mesh_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" -#include "DNA_view3d_types.h" -#include "DNA_userdef_types.h" #include "BKE_context.h" #include "BKE_curve.h" @@ -68,8 +62,6 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_anim_api.h" -#include "ED_curve.h" #include "ED_keyframes_edit.h" #include "ED_object.h" #include "ED_screen.h" diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c index 683d3964b58..37e695cf823 100644 --- a/source/blender/editors/curve/editfont.c +++ b/source/blender/editors/curve/editfont.c @@ -46,8 +46,6 @@ #include "DNA_vfont_types.h" #include "DNA_scene_types.h" #include "DNA_text_types.h" -#include "DNA_view3d_types.h" -#include "DNA_userdef_types.h" #include "BKE_context.h" #include "BKE_curve.h" @@ -66,7 +64,6 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_curve.h" #include "ED_object.h" #include "ED_screen.h" #include "ED_util.h" diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c index d01a7b7e96f..fca525c0313 100644 --- a/source/blender/editors/gpencil/drawgpencil.c +++ b/source/blender/editors/gpencil/drawgpencil.c @@ -34,19 +34,15 @@ #include "MEM_guardedalloc.h" -#include "IMB_imbuf.h" #include "IMB_imbuf_types.h" #include "BLI_math.h" #include "BLI_blenlib.h" #include "DNA_gpencil_types.h" -#include "DNA_listBase.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "DNA_userdef_types.h" -#include "DNA_view3d_types.h" #include "BKE_blender.h" #include "BKE_context.h" @@ -55,20 +51,15 @@ #include "BKE_sequencer.h" #include "BKE_utildefines.h" -#include "PIL_time.h" #include "WM_api.h" -#include "WM_types.h" #include "BIF_gl.h" #include "BIF_glutil.h" #include "ED_gpencil.h" #include "ED_sequencer.h" -#include "ED_util.h" -#include "UI_resources.h" -#include "UI_view2d.h" #include "gpencil_intern.h" diff --git a/source/blender/editors/gpencil/editaction_gpencil.c b/source/blender/editors/gpencil/editaction_gpencil.c index bfe0ba16af5..dff0839b5bd 100644 --- a/source/blender/editors/gpencil/editaction_gpencil.c +++ b/source/blender/editors/gpencil/editaction_gpencil.c @@ -36,14 +36,6 @@ #include "BLI_math.h" #include "BLI_blenlib.h" -#include "DNA_listBase.h" -#include "DNA_action_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" -#include "DNA_userdef_types.h" -#include "DNA_view3d_types.h" #include "BKE_global.h" #include "BKE_utildefines.h" @@ -54,15 +46,7 @@ #include "BIF_gl.h" #include "BIF_glutil.h" -#include "PIL_time.h" -#include "ED_anim_api.h" -#include "ED_gpencil.h" -#include "ED_keyframes_edit.h" -#include "ED_keyframes_draw.h" -#include "ED_markers.h" -#include "ED_util.h" -#include "ED_types.h" #include "gpencil_intern.h" diff --git a/source/blender/editors/gpencil/gpencil_buttons.c b/source/blender/editors/gpencil/gpencil_buttons.c index 789355d2136..98746122538 100644 --- a/source/blender/editors/gpencil/gpencil_buttons.c +++ b/source/blender/editors/gpencil/gpencil_buttons.c @@ -36,11 +36,7 @@ #include "BLI_blenlib.h" #include "DNA_gpencil_types.h" -#include "DNA_listBase.h" -#include "DNA_scene_types.h" #include "DNA_screen_types.h" -#include "DNA_userdef_types.h" -#include "DNA_windowmanager_types.h" #include "BKE_context.h" #include "BKE_global.h" @@ -56,12 +52,9 @@ #include "BIF_glutil.h" #include "ED_gpencil.h" -#include "ED_sequencer.h" -#include "ED_util.h" #include "UI_interface.h" #include "UI_resources.h" -#include "UI_view2d.h" #include "gpencil_intern.h" diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index 5c9b939aa1f..9e3ebedba0a 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -34,23 +34,16 @@ #include "MEM_guardedalloc.h" -#include "IMB_imbuf.h" -#include "IMB_imbuf_types.h" #include "BLI_math.h" #include "BLI_blenlib.h" -#include "DNA_listBase.h" -#include "DNA_armature_types.h" #include "DNA_curve_types.h" -#include "DNA_gpencil_types.h" #include "DNA_object_types.h" #include "DNA_node_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "DNA_userdef_types.h" -#include "DNA_vec_types.h" #include "DNA_view3d_types.h" #include "BKE_armature.h" @@ -76,9 +69,6 @@ #include "UI_view2d.h" -#include "ED_armature.h" -#include "ED_gpencil.h" -#include "ED_sequencer.h" #include "ED_view3d.h" #include "gpencil_intern.h" diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c index 5c8594d4016..d9bd43cc851 100644 --- a/source/blender/editors/gpencil/gpencil_ops.c +++ b/source/blender/editors/gpencil/gpencil_ops.c @@ -31,14 +31,11 @@ #include "BLI_blenlib.h" -#include "DNA_windowmanager_types.h" #include "WM_api.h" #include "WM_types.h" #include "RNA_access.h" -#include "RNA_define.h" -#include "RNA_enum_types.h" #include "gpencil_intern.h" diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index deb8e738ef7..e8c42afe00a 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -42,21 +42,12 @@ #include "BKE_report.h" #include "BKE_utildefines.h" -#include "DNA_gpencil_types.h" -#include "DNA_action_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" -#include "DNA_view2d_types.h" -#include "DNA_view3d_types.h" -#include "DNA_windowmanager_types.h" #include "UI_view2d.h" -#include "ED_armature.h" #include "ED_gpencil.h" -#include "ED_sequencer.h" #include "ED_screen.h" #include "ED_view3d.h" diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 4c9741a8057..f71b6361c85 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -32,11 +32,8 @@ #include "MEM_guardedalloc.h" -#include "DNA_ID.h" -#include "DNA_listBase.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" -#include "DNA_texture_types.h" #include "DNA_userdef_types.h" #include "BLI_math.h" @@ -58,7 +55,6 @@ #include "UI_interface.h" -#include "ED_screen.h" #include "WM_api.h" #include "WM_types.h" @@ -66,7 +62,6 @@ #include "wm_window.h" #include "RNA_access.h" -#include "RNA_types.h" #include "BPY_extern.h" diff --git a/source/blender/editors/interface/interface_anim.c b/source/blender/editors/interface/interface_anim.c index 6a7f2b2fcb7..207230a914d 100644 --- a/source/blender/editors/interface/interface_anim.c +++ b/source/blender/editors/interface/interface_anim.c @@ -16,8 +16,6 @@ #include "BKE_context.h" #include "BKE_fcurve.h" -#include "RNA_access.h" -#include "RNA_types.h" #include "ED_keyframing.h" diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c index 4cc5adabed1..b3380d91a44 100644 --- a/source/blender/editors/interface/interface_draw.c +++ b/source/blender/editors/interface/interface_draw.c @@ -29,11 +29,8 @@ #include <string.h> #include "DNA_color_types.h" -#include "DNA_listBase.h" #include "DNA_object_types.h" #include "DNA_screen_types.h" -#include "DNA_texture_types.h" -#include "DNA_userdef_types.h" #include "BLI_math.h" @@ -48,7 +45,6 @@ #include "BIF_glutil.h" #include "UI_interface.h" -#include "UI_interface_icons.h" #include "interface_intern.h" diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 4747cf05773..d4f29a70892 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -30,13 +30,8 @@ #include "MEM_guardedalloc.h" -#include "DNA_color_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_texture_types.h" -#include "DNA_userdef_types.h" -#include "DNA_windowmanager_types.h" #include "BLI_math.h" #include "BLI_blenlib.h" diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 457713755fd..d08ec2f92c5 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -44,9 +44,7 @@ #include "BLI_blenlib.h" #include "BLI_storage_types.h" -#include "DNA_material_types.h" #include "DNA_screen_types.h" -#include "DNA_scene_types.h" #include "DNA_userdef_types.h" #include "BKE_context.h" @@ -66,7 +64,6 @@ #include "UI_interface.h" #include "UI_interface_icons.h" -#include "UI_resources.h" /* elubie: should be removed once the enum for the ICONS is in BIF_preview_icons.h */ #include "interface_intern.h" diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index b792415cb36..ab199436a55 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -29,11 +29,8 @@ #include "MEM_guardedalloc.h" -#include "DNA_ID.h" -#include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_userdef_types.h" -#include "DNA_windowmanager_types.h" #include "BLI_listbase.h" #include "BLI_string.h" @@ -48,12 +45,7 @@ #include "RNA_access.h" #include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" -#include "ED_util.h" -#include "ED_types.h" -#include "ED_screen.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c index a8478d2dd1f..0b5eb475b95 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -33,11 +33,6 @@ #include "MEM_guardedalloc.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" -#include "DNA_userdef_types.h" -#include "DNA_vec_types.h" -#include "DNA_view2d_types.h" #include "BLI_blenlib.h" #include "BLI_math_color.h" @@ -53,10 +48,8 @@ #include "BIF_gl.h" -#include "ED_screen.h" #include "UI_interface.h" -#include "UI_resources.h" /* ********************************************************** */ diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c index 869ea1034e9..e4088a64a17 100644 --- a/source/blender/editors/interface/interface_panel.c +++ b/source/blender/editors/interface/interface_panel.c @@ -39,8 +39,6 @@ #include "BLI_blenlib.h" #include "BLI_math.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" #include "DNA_userdef_types.h" #include "BKE_context.h" @@ -56,7 +54,6 @@ #include "ED_screen.h" #include "UI_interface.h" -#include "UI_view2d.h" #include "interface_intern.h" diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index e12db3674d4..0df19c564f7 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -30,10 +30,7 @@ #include "MEM_guardedalloc.h" -#include "DNA_screen_types.h" -#include "DNA_view2d_types.h" #include "DNA_userdef_types.h" -#include "DNA_windowmanager_types.h" #include "BLI_math.h" #include "BLI_blenlib.h" diff --git a/source/blender/editors/interface/interface_style.c b/source/blender/editors/interface/interface_style.c index 777fb7806ad..ae149cad480 100644 --- a/source/blender/editors/interface/interface_style.c +++ b/source/blender/editors/interface/interface_style.c @@ -30,10 +30,8 @@ #include "MEM_guardedalloc.h" -#include "DNA_ID.h" #include "DNA_screen_types.h" #include "DNA_userdef_types.h" -#include "DNA_windowmanager_types.h" #include "BLI_math.h" #include "BLI_listbase.h" @@ -50,13 +48,8 @@ #include "BLF_api.h" #include "UI_interface.h" -#include "UI_interface_icons.h" -#include "UI_resources.h" -#include "UI_view2d.h" #include "ED_datafiles.h" -#include "ED_util.h" -#include "ED_types.h" #include "interface_intern.h" diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 2aef1d58403..bd55f2c2244 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -28,9 +28,7 @@ #include "MEM_guardedalloc.h" -#include "DNA_color_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" #include "DNA_userdef_types.h" #include "BLI_string.h" @@ -52,7 +50,6 @@ #include "WM_types.h" #include "UI_interface.h" -#include "UI_resources.h" #include "interface_intern.h" void ui_template_fix_linking() @@ -609,9 +606,6 @@ void uiTemplatePathBuilder(uiLayout *layout, bContext *C, PointerRNA *ptr, char #include <string.h> #include "DNA_object_force.h" -#include "DNA_object_types.h" -#include "DNA_modifier_types.h" -#include "DNA_scene_types.h" #include "BKE_depsgraph.h" #include "BKE_DerivedMesh.h" @@ -621,7 +615,6 @@ void uiTemplatePathBuilder(uiLayout *layout, bContext *C, PointerRNA *ptr, char #include "BKE_particle.h" #include "BKE_report.h" -#include "UI_resources.h" #include "ED_util.h" #include "BLI_math.h" @@ -891,7 +884,6 @@ uiLayout *uiTemplateModifier(uiLayout *layout, bContext *C, PointerRNA *ptr, int /************************ Constraint Template *************************/ -#include "DNA_action_types.h" #include "DNA_constraint_types.h" #include "BKE_action.h" diff --git a/source/blender/editors/interface/interface_utils.c b/source/blender/editors/interface/interface_utils.c index c9024704b5e..87fdc2c6669 100644 --- a/source/blender/editors/interface/interface_utils.c +++ b/source/blender/editors/interface/interface_utils.c @@ -37,8 +37,6 @@ #include "UI_interface.h" #include "UI_resources.h" -#include "WM_api.h" -#include "WM_types.h" /*************************** RNA Utilities ******************************/ diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index 5ee1cf0cba4..465a58fe5b8 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -30,10 +30,8 @@ #include "MEM_guardedalloc.h" -#include "DNA_ID.h" #include "DNA_screen_types.h" #include "DNA_userdef_types.h" -#include "DNA_windowmanager_types.h" #include "BLI_math.h" #include "BLI_listbase.h" @@ -53,11 +51,7 @@ #include "UI_interface.h" #include "UI_interface_icons.h" -#include "UI_resources.h" -#include "UI_view2d.h" -#include "ED_util.h" -#include "ED_types.h" #include "interface_intern.h" diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index fb44685ceff..aa26517ea25 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -42,7 +42,6 @@ #include "DNA_curve_types.h" -#include "DNA_listBase.h" #include "DNA_userdef_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" @@ -50,8 +49,6 @@ #include "BLI_blenlib.h" -#include "IMB_imbuf.h" -#include "IMB_imbuf_types.h" #include "BKE_DerivedMesh.h" #include "BKE_global.h" @@ -62,7 +59,6 @@ #include "BIF_gl.h" #include "UI_interface.h" -#include "UI_resources.h" #include "UI_interface_icons.h" #include "interface_intern.h" diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index 2bdf1ea4c88..d41317f7078 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -33,10 +33,7 @@ #include "MEM_guardedalloc.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" #include "DNA_userdef_types.h" -#include "DNA_view2d_types.h" #include "BLI_blenlib.h" @@ -55,7 +52,6 @@ #include "ED_screen.h" #include "UI_interface.h" -#include "UI_resources.h" #include "UI_view2d.h" #include "interface_intern.h" diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index 1dc4f52a696..135ace39581 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -29,12 +29,7 @@ #include "MEM_guardedalloc.h" -#include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" #include "DNA_userdef_types.h" -#include "DNA_vec_types.h" -#include "DNA_view2d_types.h" #include "BLI_blenlib.h" @@ -51,7 +46,6 @@ #include "ED_screen.h" -#include "UI_resources.h" #include "UI_view2d.h" static int view2d_poll(bContext *C) diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c index 123b7361251..7d47473e739 100644 --- a/source/blender/editors/mesh/editface.c +++ b/source/blender/editors/mesh/editface.c @@ -40,14 +40,9 @@ #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" -#include "DNA_image_types.h" -#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "DNA_space_types.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" -#include "DNA_view3d_types.h" #include "BKE_brush.h" #include "BKE_customdata.h" @@ -65,7 +60,6 @@ #include "BIF_gl.h" #include "BIF_glutil.h" -#include "GPU_draw.h" #ifndef DISABLE_PYTHON //#include "BPY_extern.h" @@ -74,7 +68,6 @@ #include "ED_mesh.h" #include "ED_screen.h" -#include "ED_object.h" #include "ED_view3d.h" #include "WM_api.h" diff --git a/source/blender/editors/mesh/editmesh.c b/source/blender/editors/mesh/editmesh.c index ce65529e3dd..74558d13a52 100644 --- a/source/blender/editors/mesh/editmesh.c +++ b/source/blender/editors/mesh/editmesh.c @@ -32,21 +32,8 @@ #include "MEM_guardedalloc.h" -#include "PIL_time.h" - -#include "DNA_customdata_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" -#include "DNA_object_types.h" -#include "DNA_object_force.h" -#include "DNA_screen_types.h" + #include "DNA_key_types.h" -#include "DNA_scene_types.h" -#include "DNA_view3d_types.h" -#include "DNA_material_types.h" -#include "DNA_modifier_types.h" -#include "DNA_texture_types.h" -#include "DNA_userdef_types.h" #include "BLI_blenlib.h" #include "BLI_math.h" diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c index de4230b8891..e059145393a 100644 --- a/source/blender/editors/mesh/editmesh_add.c +++ b/source/blender/editors/mesh/editmesh_add.c @@ -34,17 +34,10 @@ #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_space_types.h" -#include "DNA_screen_types.h" -#include "DNA_userdef_types.h" -#include "DNA_view3d_types.h" -#include "DNA_windowmanager_types.h" -#include "RNA_types.h" #include "RNA_define.h" #include "RNA_access.h" @@ -65,10 +58,8 @@ #include "WM_types.h" #include "ED_mesh.h" -#include "ED_retopo.h" #include "ED_screen.h" #include "ED_transform.h" -#include "ED_util.h" #include "ED_view3d.h" #include "ED_object.h" diff --git a/source/blender/editors/mesh/editmesh_lib.c b/source/blender/editors/mesh/editmesh_lib.c index 21b6b335f16..90d720e9c18 100644 --- a/source/blender/editors/mesh/editmesh_lib.c +++ b/source/blender/editors/mesh/editmesh_lib.c @@ -39,12 +39,10 @@ editmesh_lib: generic (no UI, no menus) operations/evaluators for editmesh data #include "MEM_guardedalloc.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" -#include "DNA_windowmanager_types.h" #include "BLI_blenlib.h" #include "BLI_math.h" diff --git a/source/blender/editors/mesh/editmesh_loop.c b/source/blender/editors/mesh/editmesh_loop.c index 0af330c1aac..05ce7d8c5cb 100644 --- a/source/blender/editors/mesh/editmesh_loop.c +++ b/source/blender/editors/mesh/editmesh_loop.c @@ -40,13 +40,9 @@ editmesh_loop: tools with own drawing subloops, select, knife, subdiv #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_view3d_types.h" -#include "DNA_windowmanager_types.h" #include "BLI_blenlib.h" #include "BLI_math.h" @@ -74,7 +70,6 @@ editmesh_loop: tools with own drawing subloops, select, knife, subdiv #include "WM_types.h" #include "ED_mesh.h" -#include "ED_screen.h" #include "ED_view3d.h" #include "mesh_intern.h" diff --git a/source/blender/editors/mesh/editmesh_mods.c b/source/blender/editors/mesh/editmesh_mods.c index 4cd152cbd29..06e8b118495 100644 --- a/source/blender/editors/mesh/editmesh_mods.c +++ b/source/blender/editors/mesh/editmesh_mods.c @@ -41,16 +41,11 @@ editmesh_mods.c, UI level access, no geometry changes -#include "DNA_mesh_types.h" #include "DNA_material_types.h" #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_object_types.h" -#include "DNA_texture_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" -#include "DNA_view3d_types.h" #include "BLI_blenlib.h" #include "BLI_math.h" @@ -78,11 +73,9 @@ editmesh_mods.c, UI level access, no geometry changes #include "WM_api.h" #include "WM_types.h" -#include "UI_resources.h" #include "RNA_access.h" #include "RNA_define.h" -#include "RNA_enum_types.h" #include "ED_mesh.h" #include "ED_screen.h" diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index be92a5e49ea..a4a25a6ad52 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -38,22 +38,15 @@ editmesh_tool.c: UI called tools for editmesh, geometry changes here, otherwise #include <float.h> #include "MEM_guardedalloc.h" -#include "PIL_time.h" #include "BLO_sys_types.h" // for intptr_t support -#include "DNA_mesh_types.h" -#include "DNA_material_types.h" #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_view3d_types.h" #include "DNA_key_types.h" -#include "DNA_windowmanager_types.h" -#include "RNA_types.h" #include "RNA_define.h" #include "RNA_access.h" @@ -86,10 +79,8 @@ editmesh_tool.c: UI called tools for editmesh, geometry changes here, otherwise #include "ED_mesh.h" #include "ED_screen.h" #include "ED_transform.h" -#include "ED_util.h" #include "ED_view3d.h" -#include "UI_interface.h" #include "mesh_intern.h" diff --git a/source/blender/editors/mesh/loopcut.c b/source/blender/editors/mesh/loopcut.c index 1a37832d0cd..8e9e55dbd92 100644 --- a/source/blender/editors/mesh/loopcut.c +++ b/source/blender/editors/mesh/loopcut.c @@ -69,7 +69,6 @@ #include "RNA_define.h" #include "UI_interface.h" -#include "UI_resources.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c index 1819ab26282..70352e9399f 100644 --- a/source/blender/editors/mesh/mesh_data.c +++ b/source/blender/editors/mesh/mesh_data.c @@ -32,14 +32,11 @@ #include "MEM_guardedalloc.h" -#include "DNA_customdata_types.h" #include "DNA_material_types.h" -#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_view3d_types.h" -#include "DNA_windowmanager_types.h" #include "BKE_context.h" #include "BKE_customdata.h" diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c index 34577b7349e..e98b946dd14 100644 --- a/source/blender/editors/mesh/mesh_ops.c +++ b/source/blender/editors/mesh/mesh_ops.c @@ -33,11 +33,6 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" -#include "DNA_userdef_types.h" -#include "DNA_view3d_types.h" -#include "DNA_windowmanager_types.h" #include "BLI_math.h" #include "BLI_blenlib.h" @@ -49,18 +44,14 @@ #include "BKE_utildefines.h" #include "RNA_access.h" -#include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" -#include "ED_mesh.h" #include "ED_object.h" #include "ED_screen.h" -#include "ED_transform.h" #include "ED_view3d.h" -#include "UI_interface.h" #include "mesh_intern.h" diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index 6ad88eefdd2..3d09880de8f 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -39,18 +39,12 @@ #include "MEM_guardedalloc.h" -#include "DNA_image_types.h" #include "DNA_key_types.h" #include "DNA_material_types.h" #include "DNA_meshdata_types.h" -#include "DNA_mesh_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" #include "DNA_view3d_types.h" -#include "DNA_windowmanager_types.h" -#include "DNA_world_types.h" #include "BLI_math.h" #include "BLI_blenlib.h" diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c index 94e8e31aee8..961968959ff 100644 --- a/source/blender/editors/metaball/mball_edit.c +++ b/source/blender/editors/metaball/mball_edit.c @@ -43,9 +43,6 @@ #include "DNA_meta_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_view3d_types.h" -#include "DNA_windowmanager_types.h" -#include "DNA_userdef_types.h" #include "RNA_define.h" #include "RNA_access.h" diff --git a/source/blender/editors/metaball/mball_ops.c b/source/blender/editors/metaball/mball_ops.c index 9b8cccbbfce..14402d7dae6 100644 --- a/source/blender/editors/metaball/mball_ops.c +++ b/source/blender/editors/metaball/mball_ops.c @@ -31,8 +31,6 @@ #include "RNA_access.h" -#include "DNA_listBase.h" -#include "DNA_windowmanager_types.h" #include "ED_screen.h" diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 57cebff2bf0..921a56142d4 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -30,7 +30,6 @@ #include "MEM_guardedalloc.h" -#include "DNA_action_types.h" #include "DNA_curve_types.h" #include "DNA_group_types.h" #include "DNA_lamp_types.h" @@ -38,12 +37,8 @@ #include "DNA_mesh_types.h" #include "DNA_meta_types.h" #include "DNA_object_fluidsim.h" -#include "DNA_object_types.h" #include "DNA_object_force.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_userdef_types.h" -#include "DNA_view3d_types.h" #include "DNA_vfont_types.h" #include "BLI_math.h" @@ -83,7 +78,6 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_anim_api.h" #include "ED_armature.h" #include "ED_curve.h" #include "ED_mball.h" diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c index 1c8b71f5e44..8d5268bcb79 100644 --- a/source/blender/editors/object/object_bake.c +++ b/source/blender/editors/object/object_bake.c @@ -35,7 +35,6 @@ #include "MEM_guardedalloc.h" -#include "DNA_image_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c index 74541aa791b..38d560c5c8e 100644 --- a/source/blender/editors/object/object_constraint.c +++ b/source/blender/editors/object/object_constraint.c @@ -36,15 +36,10 @@ #include "BLI_math.h" #include "BLI_dynstr.h" -#include "DNA_action_types.h" -#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_screen_types.h" #include "DNA_text_types.h" -#include "DNA_view3d_types.h" #include "BKE_action.h" #include "BKE_armature.h" @@ -68,9 +63,7 @@ #include "RNA_access.h" #include "RNA_define.h" #include "RNA_enum_types.h" -#include "RNA_types.h" -#include "ED_object.h" #include "ED_screen.h" #include "UI_interface.h" diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 82f5becd7e5..976990deda8 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -35,36 +35,14 @@ #include "IMB_imbuf_types.h" -#include "DNA_action_types.h" #include "DNA_armature_types.h" -#include "DNA_camera_types.h" -#include "DNA_constraint_types.h" #include "DNA_curve_types.h" -#include "DNA_effect_types.h" #include "DNA_group_types.h" -#include "DNA_image_types.h" -#include "DNA_key_types.h" -#include "DNA_lamp_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_nla_types.h" -#include "DNA_object_types.h" -#include "DNA_object_fluidsim.h" -#include "DNA_object_force.h" -#include "DNA_scene_types.h" -#include "DNA_space_types.h" -#include "DNA_screen_types.h" -#include "DNA_texture_types.h" -#include "DNA_particle_types.h" #include "DNA_property_types.h" -#include "DNA_userdef_types.h" -#include "DNA_view3d_types.h" #include "DNA_vfont_types.h" -#include "DNA_world_types.h" -#include "DNA_modifier_types.h" #include "BLI_blenlib.h" #include "BLI_math.h" @@ -113,28 +91,20 @@ #include "BKE_utildefines.h" #include "BKE_modifier.h" -#include "ED_anim_api.h" #include "ED_armature.h" #include "ED_curve.h" -#include "ED_particle.h" #include "ED_mesh.h" #include "ED_mball.h" #include "ED_object.h" #include "ED_screen.h" -#include "ED_transform.h" -#include "ED_types.h" #include "ED_util.h" -#include "ED_view3d.h" -#include "UI_interface.h" #include "RNA_access.h" #include "RNA_define.h" #include "RNA_enum_types.h" /* for menu/popup icons etc etc*/ -#include "UI_interface.h" -#include "UI_resources.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c index fef292ee794..37a04471ec5 100644 --- a/source/blender/editors/object/object_hook.c +++ b/source/blender/editors/object/object_hook.c @@ -35,16 +35,11 @@ #include "BLI_listbase.h" #include "BLI_string.h" -#include "DNA_action_types.h" #include "DNA_curve_types.h" #include "DNA_lattice_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" -#include "DNA_view3d_types.h" -#include "DNA_windowmanager_types.h" #include "BKE_action.h" #include "BKE_context.h" @@ -62,14 +57,11 @@ #include "ED_curve.h" #include "ED_mesh.h" -#include "ED_object.h" -#include "ED_view3d.h" #include "ED_screen.h" #include "WM_types.h" #include "WM_api.h" -#include "UI_interface.h" #include "UI_resources.h" #include "object_intern.h" diff --git a/source/blender/editors/object/object_lattice.c b/source/blender/editors/object/object_lattice.c index 1352fc7e054..52f779748fa 100644 --- a/source/blender/editors/object/object_lattice.c +++ b/source/blender/editors/object/object_lattice.c @@ -47,7 +47,6 @@ #include "BKE_mesh.h" #include "BKE_utildefines.h" -#include "ED_object.h" #include "ED_screen.h" #include "ED_view3d.h" #include "ED_util.h" diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index c1456c9a484..8150bd9b84f 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -31,13 +31,10 @@ #include "MEM_guardedalloc.h" -#include "DNA_action_types.h" #include "DNA_curve_types.h" #include "DNA_key_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_modifier_types.h" -#include "DNA_object_types.h" #include "DNA_object_force.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c index bbc5bcd8035..25bfd0e6bb5 100644 --- a/source/blender/editors/object/object_ops.c +++ b/source/blender/editors/object/object_ops.c @@ -33,11 +33,6 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" -#include "DNA_userdef_types.h" -#include "DNA_view3d_types.h" -#include "DNA_windowmanager_types.h" #include "BLI_math.h" #include "BLI_blenlib.h" diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 0df7a99017b..06075c4ff35 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -32,20 +32,14 @@ #include "MEM_guardedalloc.h" #include "DNA_anim_types.h" -#include "DNA_armature_types.h" -#include "DNA_camera_types.h" #include "DNA_constraint_types.h" -#include "DNA_curve_types.h" #include "DNA_group_types.h" #include "DNA_lamp_types.h" #include "DNA_lattice_types.h" #include "DNA_material_types.h" -#include "DNA_mesh_types.h" #include "DNA_meta_types.h" -#include "DNA_object_types.h" #include "DNA_particle_types.h" #include "DNA_scene_types.h" -#include "DNA_view3d_types.h" #include "DNA_world_types.h" #include "BLI_math.h" @@ -86,7 +80,6 @@ #include "RNA_define.h" #include "RNA_enum_types.h" -#include "ED_anim_api.h" #include "ED_armature.h" #include "ED_curve.h" #include "ED_object.h" diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c index b3c104dcb56..a5a9bbdffdd 100644 --- a/source/blender/editors/object/object_select.c +++ b/source/blender/editors/object/object_select.c @@ -35,10 +35,8 @@ #include "DNA_group_types.h" #include "DNA_material_types.h" #include "DNA_modifier_types.h" -#include "DNA_object_types.h" #include "DNA_property_types.h" #include "DNA_scene_types.h" -#include "DNA_texture_types.h" #include "BLI_math.h" #include "BLI_listbase.h" @@ -60,7 +58,6 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_object.h" #include "ED_screen.h" #include "RNA_access.h" diff --git a/source/blender/editors/object/object_shapekey.c b/source/blender/editors/object/object_shapekey.c index 3cf29cd3eaf..6735d07b591 100644 --- a/source/blender/editors/object/object_shapekey.c +++ b/source/blender/editors/object/object_shapekey.c @@ -39,19 +39,12 @@ #include "BLI_blenlib.h" #include "BLI_math.h" -#include "DNA_action_types.h" #include "DNA_curve_types.h" -#include "DNA_ipo_types.h" #include "DNA_key_types.h" #include "DNA_lattice_types.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_userdef_types.h" -#include "DNA_view2d_types.h" #include "BKE_action.h" #include "BKE_anim.h" @@ -69,7 +62,6 @@ #include "BLO_sys_types.h" // for intptr_t support -#include "ED_object.h" #include "ED_mesh.h" #include "RNA_access.h" diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index ca6feabdf80..13b7f883922 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -29,16 +29,11 @@ #include <string.h> #include "DNA_anim_types.h" -#include "DNA_action_types.h" #include "DNA_armature_types.h" -#include "DNA_curve_types.h" #include "DNA_key_types.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_view3d_types.h" #include "BLI_math.h" #include "BLI_editVert.h" @@ -60,12 +55,10 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_anim_api.h" #include "ED_armature.h" #include "ED_curve.h" #include "ED_keyframing.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_vgroup.c b/source/blender/editors/object/object_vgroup.c index f70f91d16f0..6c9b45a63cd 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -36,14 +36,12 @@ #include "DNA_cloth_types.h" #include "DNA_curve_types.h" #include "DNA_lattice_types.h" -#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" #include "DNA_object_types.h" #include "DNA_object_force.h" #include "DNA_scene_types.h" #include "DNA_particle_types.h" -#include "DNA_windowmanager_types.h" #include "BLI_blenlib.h" #include "BLI_editVert.h" @@ -68,9 +66,7 @@ #include "WM_types.h" #include "ED_mesh.h" -#include "ED_view3d.h" -#include "UI_interface.h" #include "UI_resources.h" #include "object_intern.h" diff --git a/source/blender/editors/physics/particle_boids.c b/source/blender/editors/physics/particle_boids.c index 7fa35d8c8ee..37de0d8f873 100644 --- a/source/blender/editors/physics/particle_boids.c +++ b/source/blender/editors/physics/particle_boids.c @@ -29,9 +29,7 @@ #include "MEM_guardedalloc.h" -#include "DNA_boid_types.h" #include "DNA_particle_types.h" -#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "BKE_boids.h" diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 2261aa6b57b..43fc4985d3d 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -36,15 +36,9 @@ #include "DNA_scene_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_modifier_types.h" -#include "DNA_object_force.h" -#include "DNA_object_types.h" -#include "DNA_vec_types.h" -#include "DNA_userdef_types.h" #include "DNA_view3d_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "DNA_windowmanager_types.h" #include "BKE_DerivedMesh.h" #include "BKE_depsgraph.h" @@ -66,7 +60,6 @@ #include "BLI_kdtree.h" #include "BLI_rand.h" -#include "PIL_time.h" #include "BIF_gl.h" #include "BIF_glutil.h" @@ -75,7 +68,6 @@ #include "ED_particle.h" #include "ED_view3d.h" -#include "UI_interface.h" #include "UI_resources.h" #include "WM_api.h" diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index 049f09f9901..d8ca65fa8c9 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -32,10 +32,7 @@ #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" -#include "DNA_object_types.h" -#include "DNA_particle_types.h" #include "DNA_scene_types.h" -#include "DNA_windowmanager_types.h" #include "BLI_math.h" #include "BLI_listbase.h" diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index bbbc0d7fbbc..8c05a4efcf6 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -45,20 +45,7 @@ #include "MEM_guardedalloc.h" /* types */ -#include "DNA_curve_types.h" -#include "DNA_object_types.h" #include "DNA_object_fluidsim.h" -#include "DNA_key_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" -#include "DNA_lattice_types.h" -#include "DNA_scene_types.h" -#include "DNA_camera_types.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" -#include "DNA_userdef_types.h" -#include "DNA_ipo_types.h" -#include "DNA_key_types.h" #include "BLI_blenlib.h" #include "BLI_threads.h" @@ -81,16 +68,13 @@ #include "BKE_scene.h" #include "BKE_softbody.h" -#include "PIL_time.h" #include "LBM_fluidsim.h" #include "BIF_gl.h" -#include "ED_fluidsim.h" #include "ED_screen.h" -#include "WM_api.h" #include "WM_types.h" #include "physics_intern.h" // own include @@ -98,10 +82,18 @@ /* enable/disable overall compilation */ #ifndef DISABLE_ELBEEM +#include "WM_api.h" + +#include "DNA_scene_types.h" +#include "DNA_ipo_types.h" +#include "DNA_mesh_types.h" + +#include "PIL_time.h" + /* XXX */ /* from header info.c */ static int start_progress_bar(void) {return 0;}; -static void end_progress_bar(wmWindow *win) {WM_cursor_restore(win);}; +static void end_progress_bar(struct wmWindow *win) {WM_cursor_restore(win);}; static void waitcursor(int val) {}; static int progress_bar(wmWindow *win, float done, char *busy_info) { WM_timecursor(win,done*100); return 0;} static int pupmenu() {return 0;} diff --git a/source/blender/editors/physics/physics_ops.c b/source/blender/editors/physics/physics_ops.c index 1425fdc10cf..4bdac8ff3e8 100644 --- a/source/blender/editors/physics/physics_ops.c +++ b/source/blender/editors/physics/physics_ops.c @@ -27,7 +27,6 @@ #include <stdlib.h> -#include "DNA_windowmanager_types.h" #include "RNA_access.h" diff --git a/source/blender/editors/physics/physics_pointcache.c b/source/blender/editors/physics/physics_pointcache.c index 1359af5377f..19f4d8457c1 100644 --- a/source/blender/editors/physics/physics_pointcache.c +++ b/source/blender/editors/physics/physics_pointcache.c @@ -32,8 +32,6 @@ #include "MEM_guardedalloc.h" #include "DNA_scene_types.h" -#include "DNA_object_force.h" -#include "DNA_modifier_types.h" #include "BKE_context.h" #include "BKE_particle.h" @@ -46,12 +44,8 @@ #include "BLI_blenlib.h" -#include "ED_screen.h" -#include "ED_physics.h" #include "ED_particle.h" -#include "UI_interface.h" -#include "UI_resources.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 44d3b2bec7f..678de91e1b4 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -35,14 +35,7 @@ #include "BLI_editVert.h" #include "BLI_dlrbTree.h" -#include "DNA_armature_types.h" -#include "DNA_image_types.h" -#include "DNA_lattice_types.h" -#include "DNA_object_types.h" -#include "DNA_mesh_types.h" -#include "DNA_curve_types.h" #include "DNA_scene_types.h" -#include "DNA_meta_types.h" #include "BKE_blender.h" #include "BKE_colortools.h" @@ -65,12 +58,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_util.h" #include "ED_screen.h" -#include "ED_mesh.h" #include "ED_object.h" -#include "ED_screen_types.h" -#include "ED_keyframes_draw.h" #include "RE_pipeline.h" #include "IMB_imbuf.h" @@ -79,8 +68,6 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "UI_interface.h" -#include "UI_resources.h" #include "wm_window.h" diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index 196c6aa87e4..1b1e3114fd8 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -37,9 +37,7 @@ #include "BLI_editVert.h" #include "BLI_dlrbTree.h" -#include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_view3d_types.h" #include "BKE_blender.h" #include "BKE_object.h" @@ -59,23 +57,15 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_util.h" #include "ED_screen.h" -#include "ED_mesh.h" -#include "ED_object.h" -#include "ED_screen_types.h" -#include "ED_keyframes_draw.h" #include "ED_view3d.h" #include "RE_pipeline.h" -#include "IMB_imbuf.h" #include "IMB_imbuf_types.h" #include "RNA_access.h" #include "RNA_define.h" -#include "UI_interface.h" -#include "UI_resources.h" #include "GPU_extensions.h" diff --git a/source/blender/editors/render/render_ops.c b/source/blender/editors/render/render_ops.c index 366fc5cf5b7..d483f8e4af7 100644 --- a/source/blender/editors/render/render_ops.c +++ b/source/blender/editors/render/render_ops.c @@ -27,10 +27,8 @@ #include <stdlib.h> -#include "DNA_windowmanager_types.h" #include "WM_api.h" -#include "WM_types.h" #include "render_intern.h" // own include diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index 1eac01a1fa1..2b9526ef635 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -46,12 +46,9 @@ #include "BLI_blenlib.h" #include "BLI_threads.h" -#include "DNA_texture_types.h" #include "DNA_world_types.h" #include "DNA_camera_types.h" -#include "DNA_image_types.h" #include "DNA_material_types.h" -#include "DNA_node_types.h" #include "DNA_object_types.h" #include "DNA_lamp_types.h" #include "DNA_space_types.h" @@ -83,7 +80,6 @@ #include "RE_pipeline.h" -#include "GPU_material.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 3f1b13c070c..1876aa5b44a 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -32,10 +32,8 @@ #include "DNA_curve_types.h" #include "DNA_lamp_types.h" #include "DNA_material_types.h" -#include "DNA_meshdata_types.h" #include "DNA_node_types.h" #include "DNA_object_types.h" -#include "DNA_texture_types.h" #include "DNA_scene_types.h" #include "DNA_space_types.h" #include "DNA_world_types.h" @@ -68,20 +66,16 @@ #include "GPU_material.h" #include "RNA_access.h" -#include "RNA_enum_types.h" #include "WM_api.h" #include "WM_types.h" #include "ED_curve.h" #include "ED_mesh.h" -#include "ED_render.h" -#include "RNA_access.h" #include "RNA_define.h" #include "UI_interface.h" -#include "UI_resources.h" #include "render_intern.h" // own include diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 3d30b24723e..61aa7a63da9 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -31,8 +31,6 @@ #include "MEM_guardedalloc.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" // for stopping filebrowser thread on space change #include "DNA_userdef_types.h" #include "BLI_blenlib.h" diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c index e97662b357c..06da91c3e37 100644 --- a/source/blender/editors/screen/glutil.c +++ b/source/blender/editors/screen/glutil.c @@ -32,7 +32,6 @@ #include "MEM_guardedalloc.h" #include "DNA_vec_types.h" -#include "DNA_listBase.h" #include "BKE_utildefines.h" #include "BKE_colortools.h" diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c index 902570f8717..38f0778ea0c 100644 --- a/source/blender/editors/screen/screen_context.c +++ b/source/blender/editors/screen/screen_context.c @@ -29,7 +29,6 @@ #include "DNA_object_types.h" #include "DNA_armature_types.h" -#include "DNA_action_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 26d731da5ea..4ec63c3c481 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -28,10 +28,7 @@ #include "MEM_guardedalloc.h" -#include "DNA_vec_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_texture_types.h" #include "DNA_userdef_types.h" #include "BLI_blenlib.h" diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 11a7ac119a4..afdad624c1e 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -37,7 +37,6 @@ #include "DNA_armature_types.h" #include "DNA_lattice_types.h" #include "DNA_object_types.h" -#include "DNA_mesh_types.h" #include "DNA_curve_types.h" #include "DNA_scene_types.h" #include "DNA_meta_types.h" @@ -63,7 +62,6 @@ #include "ED_util.h" #include "ED_screen.h" -#include "ED_mesh.h" #include "ED_object.h" #include "ED_screen_types.h" #include "ED_keyframes_draw.h" @@ -72,7 +70,6 @@ #include "RNA_define.h" #include "UI_interface.h" -#include "UI_resources.h" #include "wm_window.h" diff --git a/source/blender/editors/screen/screendump.c b/source/blender/editors/screen/screendump.c index 16ccbdb3c79..b6cb6978dc1 100644 --- a/source/blender/editors/screen/screendump.c +++ b/source/blender/editors/screen/screendump.c @@ -57,8 +57,6 @@ #include "PIL_time.h" -#include "ED_fileselect.h" -#include "ED_screen.h" #include "ED_screen_types.h" #include "screen_intern.h" diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index 1ab16cdde2c..df2e4032257 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -50,18 +50,10 @@ #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "DNA_brush_types.h" -#include "DNA_image_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_screen_types.h" -#include "DNA_space_types.h" -#include "DNA_userdef_types.h" -#include "DNA_view3d_types.h" -#include "DNA_windowmanager_types.h" #include "BKE_context.h" #include "BKE_idprop.h" @@ -82,11 +74,9 @@ #include "BIF_gl.h" #include "BIF_glutil.h" -#include "UI_interface.h" #include "UI_view2d.h" #include "ED_image.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/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c index 07abedfcf8d..abd56babd8d 100644 --- a/source/blender/editors/sculpt_paint/paint_ops.c +++ b/source/blender/editors/sculpt_paint/paint_ops.c @@ -19,7 +19,6 @@ * ***** END GPL LICENSE BLOCK ***** */ -#include "DNA_brush_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" @@ -27,7 +26,6 @@ #include "BKE_context.h" #include "BKE_paint.h" -#include "ED_sculpt.h" #include "ED_screen.h" #include "UI_resources.h" @@ -36,7 +34,6 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "RNA_enum_types.h" #include "paint_intern.h" #include "sculpt_intern.h" diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c index 9f104586bd2..c25b5685844 100644 --- a/source/blender/editors/sculpt_paint/paint_stroke.c +++ b/source/blender/editors/sculpt_paint/paint_stroke.c @@ -28,10 +28,8 @@ #include "MEM_guardedalloc.h" -#include "DNA_brush_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" #include "RNA_access.h" @@ -43,7 +41,6 @@ #include "BLI_math.h" -#include "PIL_time.h" #include "BIF_gl.h" #include "BIF_glutil.h" diff --git a/source/blender/editors/sculpt_paint/paint_utils.c b/source/blender/editors/sculpt_paint/paint_utils.c index 8d6dddd756d..85fbd5954e8 100644 --- a/source/blender/editors/sculpt_paint/paint_utils.c +++ b/source/blender/editors/sculpt_paint/paint_utils.c @@ -7,8 +7,6 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_view3d_types.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index e8aaf889ae2..d1274cdac8b 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -45,22 +45,9 @@ #include "BLI_math.h" #include "BLI_ghash.h" -#include "DNA_anim_types.h" -#include "DNA_action_types.h" #include "DNA_armature_types.h" -#include "DNA_brush_types.h" -#include "DNA_cloth_types.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" -#include "DNA_modifier_types.h" -#include "DNA_object_types.h" -#include "DNA_object_force.h" #include "DNA_particle_types.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" -#include "DNA_scene_types.h" -#include "DNA_view3d_types.h" -#include "DNA_userdef_types.h" #include "RNA_access.h" #include "RNA_define.h" @@ -90,9 +77,7 @@ #include "ED_armature.h" #include "ED_mesh.h" -#include "ED_object.h" #include "ED_screen.h" -#include "ED_util.h" #include "ED_view3d.h" #include "paint_intern.h" diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index a24e9d86666..0b11c1a25f6 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -39,20 +39,11 @@ #include "BLI_pbvh.h" #include "BLI_threads.h" -#include "DNA_armature_types.h" -#include "DNA_brush_types.h" -#include "DNA_image_types.h" #include "DNA_key_types.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_modifier_types.h" #include "DNA_object_types.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" -#include "DNA_texture_types.h" -#include "DNA_view3d_types.h" -#include "DNA_userdef_types.h" -#include "DNA_color_types.h" #include "BKE_brush.h" #include "BKE_cdderivedmesh.h" @@ -79,11 +70,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_object.h" #include "ED_screen.h" #include "ED_sculpt.h" -#include "ED_space_api.h" -#include "ED_util.h" #include "ED_view3d.h" #include "paint_intern.h" #include "sculpt_intern.h" @@ -91,12 +79,9 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "IMB_imbuf_types.h" #include "RE_render_ext.h" -#include "RE_shader_ext.h" /*for multitex_ext*/ -#include "GPU_draw.h" #include "gpu_buffers.h" #include <math.h> diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c index 39717273278..4edc85a4492 100644 --- a/source/blender/editors/sound/sound_ops.c +++ b/source/blender/editors/sound/sound_ops.c @@ -33,9 +33,7 @@ #include "DNA_packedFile_types.h" #include "DNA_scene_types.h" #include "DNA_space_types.h" -#include "DNA_sound_types.h" #include "DNA_sequence_types.h" -#include "DNA_windowmanager_types.h" #include "BKE_context.h" #include "BKE_global.h" @@ -47,7 +45,6 @@ #include "BLI_blenlib.h" -#include "ED_sound.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_action/action_draw.c b/source/blender/editors/space_action/action_draw.c index 9c394f51d43..d486bff9b6f 100644 --- a/source/blender/editors/space_action/action_draw.c +++ b/source/blender/editors/space_action/action_draw.c @@ -45,26 +45,8 @@ /* Types --------------------------------------------------------------- */ -#include "DNA_listBase.h" #include "DNA_anim_types.h" -#include "DNA_action_types.h" -#include "DNA_armature_types.h" -#include "DNA_camera_types.h" -#include "DNA_curve_types.h" -#include "DNA_object_types.h" -#include "DNA_particle_types.h" #include "DNA_screen_types.h" -#include "DNA_scene_types.h" -#include "DNA_space_types.h" -#include "DNA_constraint_types.h" -#include "DNA_key_types.h" -#include "DNA_lamp_types.h" -#include "DNA_material_types.h" -#include "DNA_meta_types.h" -#include "DNA_userdef_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_windowmanager_types.h" -#include "DNA_world_types.h" #include "BKE_action.h" #include "BKE_depsgraph.h" @@ -82,15 +64,11 @@ #include "BIF_glutil.h" #include "UI_interface.h" -#include "UI_interface_icons.h" #include "UI_resources.h" #include "UI_view2d.h" #include "ED_anim_api.h" -#include "ED_keyframing.h" #include "ED_keyframes_draw.h" -#include "ED_screen.h" -#include "ED_space_api.h" /* ************************************************************************* */ diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c index ba8e49e3789..b71781f18e5 100644 --- a/source/blender/editors/space_action/action_edit.c +++ b/source/blender/editors/space_action/action_edit.c @@ -42,21 +42,8 @@ #include "BLI_math.h" #include "DNA_anim_types.h" -#include "DNA_action_types.h" -#include "DNA_armature_types.h" -#include "DNA_camera_types.h" -#include "DNA_curve_types.h" #include "DNA_object_types.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" -#include "DNA_space_types.h" -#include "DNA_constraint_types.h" -#include "DNA_key_types.h" -#include "DNA_lamp_types.h" -#include "DNA_material_types.h" -#include "DNA_userdef_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_windowmanager_types.h" #include "RNA_access.h" #include "RNA_define.h" @@ -77,10 +64,8 @@ #include "ED_anim_api.h" #include "ED_keyframing.h" -#include "ED_keyframes_draw.h" #include "ED_keyframes_edit.h" #include "ED_screen.h" -#include "ED_space_api.h" #include "ED_transform.h" #include "WM_api.h" diff --git a/source/blender/editors/space_action/action_ops.c b/source/blender/editors/space_action/action_ops.c index d570da2fd62..f65bd67dcf8 100644 --- a/source/blender/editors/space_action/action_ops.c +++ b/source/blender/editors/space_action/action_ops.c @@ -31,28 +31,19 @@ #include "MEM_guardedalloc.h" -#include "DNA_listBase.h" -#include "DNA_anim_types.h" -#include "DNA_action_types.h" -#include "DNA_scene_types.h" -#include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "DNA_windowmanager_types.h" #include "BLI_blenlib.h" #include "BKE_context.h" #include "BKE_utildefines.h" -#include "UI_interface.h" -#include "UI_view2d.h" #include "ED_transform.h" #include "action_intern.h" #include "RNA_access.h" -#include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c index e8e44fa3ebf..257d22e17b6 100644 --- a/source/blender/editors/space_action/action_select.c +++ b/source/blender/editors/space_action/action_select.c @@ -40,22 +40,8 @@ #include "BLI_dlrbTree.h" #include "DNA_anim_types.h" -#include "DNA_action_types.h" -#include "DNA_armature_types.h" -#include "DNA_camera_types.h" -#include "DNA_curve_types.h" #include "DNA_object_types.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" -#include "DNA_space_types.h" -#include "DNA_constraint_types.h" -#include "DNA_key_types.h" -#include "DNA_lamp_types.h" -#include "DNA_material_types.h" -#include "DNA_userdef_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_windowmanager_types.h" -#include "DNA_world_types.h" #include "RNA_access.h" #include "RNA_define.h" @@ -73,12 +59,10 @@ #include "UI_view2d.h" #include "ED_anim_api.h" -#include "ED_keyframing.h" #include "ED_keyframes_draw.h" #include "ED_keyframes_edit.h" #include "ED_markers.h" #include "ED_screen.h" -#include "ED_space_api.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_action/space_action.c b/source/blender/editors/space_action/space_action.c index 00443bd2db2..7e02454254b 100644 --- a/source/blender/editors/space_action/space_action.c +++ b/source/blender/editors/space_action/space_action.c @@ -29,12 +29,8 @@ #include <string.h> #include <stdio.h> -#include "DNA_listBase.h" #include "DNA_action_types.h" -#include "DNA_object_types.h" -#include "DNA_space_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" #include "MEM_guardedalloc.h" @@ -47,7 +43,6 @@ #include "BKE_screen.h" #include "BKE_utildefines.h" -#include "ED_space_api.h" #include "ED_screen.h" #include "BIF_gl.h" @@ -55,12 +50,10 @@ #include "WM_api.h" #include "WM_types.h" -#include "UI_interface.h" #include "UI_resources.h" #include "UI_view2d.h" #include "ED_anim_api.h" -#include "ED_keyframes_draw.h" #include "ED_markers.h" #include "action_intern.h" // own include diff --git a/source/blender/editors/space_api/space.c b/source/blender/editors/space_api/space.c index 89436c37a0a..66cb88ebf70 100644 --- a/source/blender/editors/space_api/space.c +++ b/source/blender/editors/space_api/space.c @@ -37,7 +37,6 @@ #include "BKE_context.h" #include "BKE_screen.h" -#include "ED_screen.h" /* */ diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c index b81fd384a6a..ba7172b0da8 100644 --- a/source/blender/editors/space_api/spacetypes.c +++ b/source/blender/editors/space_api/spacetypes.c @@ -28,7 +28,6 @@ #include "BLI_blenlib.h" #include "DNA_object_types.h" -#include "DNA_scene_types.h" #include "DNA_windowmanager_types.h" #include "BKE_context.h" diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index c0195fa71fb..e1df3b9f18f 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -31,17 +31,10 @@ #include "MEM_guardedalloc.h" #include "DNA_armature_types.h" -#include "DNA_brush_types.h" #include "DNA_lamp_types.h" #include "DNA_material_types.h" -#include "DNA_modifier_types.h" #include "DNA_node_types.h" -#include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" -#include "DNA_particle_types.h" -#include "DNA_texture_types.h" #include "DNA_world_types.h" #include "BLI_listbase.h" diff --git a/source/blender/editors/space_buttons/buttons_header.c b/source/blender/editors/space_buttons/buttons_header.c index 18f266f85c6..d8cbbb0cbae 100644 --- a/source/blender/editors/space_buttons/buttons_header.c +++ b/source/blender/editors/space_buttons/buttons_header.c @@ -29,11 +29,6 @@ #include <string.h> #include <stdio.h> -#include "DNA_object_types.h" -#include "DNA_space_types.h" -#include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_windowmanager_types.h" #include "MEM_guardedalloc.h" @@ -45,10 +40,7 @@ #include "ED_screen.h" #include "ED_types.h" -#include "ED_util.h" -#include "WM_api.h" -#include "WM_types.h" #include "BIF_gl.h" #include "BIF_glutil.h" diff --git a/source/blender/editors/space_buttons/buttons_ops.c b/source/blender/editors/space_buttons/buttons_ops.c index 3ef111144de..9261e28cd6a 100644 --- a/source/blender/editors/space_buttons/buttons_ops.c +++ b/source/blender/editors/space_buttons/buttons_ops.c @@ -30,8 +30,6 @@ #include "MEM_guardedalloc.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" #include "BKE_context.h" @@ -41,10 +39,8 @@ #include "ED_screen.h" #include "RNA_access.h" -#include "RNA_define.h" #include "UI_interface.h" -#include "UI_resources.h" #include "buttons_intern.h" // own include diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c index 1be3df60b1a..370076b5b07 100644 --- a/source/blender/editors/space_buttons/space_buttons.c +++ b/source/blender/editors/space_buttons/space_buttons.c @@ -29,11 +29,6 @@ #include <string.h> #include <stdio.h> -#include "DNA_object_types.h" -#include "DNA_space_types.h" -#include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_userdef_types.h" #include "MEM_guardedalloc.h" @@ -45,7 +40,6 @@ #include "BKE_context.h" #include "BKE_screen.h" -#include "ED_space_api.h" #include "ED_screen.h" #include "BIF_gl.h" @@ -53,7 +47,6 @@ #include "WM_api.h" #include "WM_types.h" -#include "UI_interface.h" #include "UI_resources.h" #include "UI_view2d.h" diff --git a/source/blender/editors/space_console/console_draw.c b/source/blender/editors/space_console/console_draw.c index 708089f8f4c..db7bb8419e8 100644 --- a/source/blender/editors/space_console/console_draw.c +++ b/source/blender/editors/space_console/console_draw.c @@ -41,7 +41,6 @@ #include "DNA_space_types.h" #include "DNA_screen_types.h" -#include "DNA_userdef_types.h" #include "BKE_global.h" #include "BKE_main.h" @@ -56,7 +55,6 @@ #include "ED_datafiles.h" #include "ED_types.h" -#include "UI_interface.h" #include "UI_resources.h" #include "console_intern.h" diff --git a/source/blender/editors/space_console/console_ops.c b/source/blender/editors/space_console/console_ops.c index 23e50e1a200..089e769e0d9 100644 --- a/source/blender/editors/space_console/console_ops.c +++ b/source/blender/editors/space_console/console_ops.c @@ -34,15 +34,10 @@ #include "MEM_guardedalloc.h" -#include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" #include "DNA_userdef_types.h" -#include "DNA_windowmanager_types.h" #include "BLI_blenlib.h" #include "BLI_dynstr.h" -#include "PIL_time.h" #include "BKE_utildefines.h" #include "BKE_context.h" @@ -57,9 +52,6 @@ #include "WM_types.h" #include "ED_screen.h" -#include "ED_types.h" -#include "UI_interface.h" -#include "UI_resources.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_console/console_report.c b/source/blender/editors/space_console/console_report.c index 7cf41bf0225..50829e4365c 100644 --- a/source/blender/editors/space_console/console_report.c +++ b/source/blender/editors/space_console/console_report.c @@ -32,14 +32,9 @@ #include "MEM_guardedalloc.h" -#include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" -#include "DNA_windowmanager_types.h" #include "BLI_blenlib.h" #include "BLI_dynstr.h" -#include "PIL_time.h" #include "BKE_utildefines.h" #include "BKE_context.h" @@ -54,8 +49,6 @@ #include "ED_screen.h" #include "ED_types.h" -#include "UI_interface.h" -#include "UI_resources.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_console/space_console.c b/source/blender/editors/space_console/space_console.c index beabc033d7e..97e1403e435 100644 --- a/source/blender/editors/space_console/space_console.c +++ b/source/blender/editors/space_console/space_console.c @@ -29,9 +29,6 @@ #include <string.h> #include <stdio.h> -#include "DNA_space_types.h" -#include "DNA_scene_types.h" -#include "DNA_screen_types.h" #include "MEM_guardedalloc.h" @@ -42,19 +39,16 @@ #include "BKE_context.h" #include "BKE_screen.h" -#include "ED_space_api.h" #include "ED_screen.h" #include "BIF_gl.h" #include "RNA_access.h" -#include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" -#include "UI_interface.h" #include "UI_resources.h" #include "UI_view2d.h" diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c index 3b42f3fb825..92994b3de53 100644 --- a/source/blender/editors/space_file/file_draw.c +++ b/source/blender/editors/space_file/file_draw.c @@ -46,20 +46,12 @@ #include "BLF_api.h" -#include "DNA_space_types.h" -#include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_userdef_types.h" -#include "DNA_windowmanager_types.h" -#include "ED_datafiles.h" #include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "MEM_guardedalloc.h" -#include "PIL_time.h" #include "RNA_access.h" @@ -71,7 +63,6 @@ #include "UI_resources.h" #include "UI_view2d.h" -#include "WM_api.h" #include "WM_types.h" #include "fsmenu.h" diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index 1e9a7e1a706..ecbac050712 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -36,10 +36,7 @@ #ifdef WIN32 #include "BLI_winstuff.h" #endif -#include "DNA_space_types.h" -#include "DNA_userdef_types.h" -#include "ED_space_api.h" #include "ED_screen.h" #include "ED_fileselect.h" @@ -48,7 +45,6 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "UI_interface.h" #include "UI_view2d.h" #include "WM_api.h" diff --git a/source/blender/editors/space_file/file_panels.c b/source/blender/editors/space_file/file_panels.c index b6152f26947..b9622d64ee4 100644 --- a/source/blender/editors/space_file/file_panels.c +++ b/source/blender/editors/space_file/file_panels.c @@ -33,8 +33,6 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "DNA_userdef_types.h" -#include "DNA_windowmanager_types.h" #include "MEM_guardedalloc.h" @@ -42,7 +40,6 @@ #include "UI_interface.h" #include "UI_resources.h" -#include "UI_view2d.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index 0668e2fe9cb..35779970788 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -84,7 +84,6 @@ #include "PIL_time.h" -#include "UI_interface.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c index cce821f3f21..e025d6d2b9a 100644 --- a/source/blender/editors/space_file/filesel.c +++ b/source/blender/editors/space_file/filesel.c @@ -43,10 +43,8 @@ #endif #include "DNA_space_types.h" -#include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_userdef_types.h" -#include "DNA_windowmanager_types.h" #include "MEM_guardedalloc.h" @@ -63,10 +61,7 @@ #include "BLF_api.h" -#include "DNA_userdef_types.h" -#include "ED_screen.h" -#include "ED_util.h" #include "ED_fileselect.h" #include "WM_api.h" @@ -78,8 +73,6 @@ #include "RNA_access.h" #include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" #include "file_intern.h" #include "filelist.h" diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c index 9493bfdf209..6cef78d4bee 100644 --- a/source/blender/editors/space_file/space_file.c +++ b/source/blender/editors/space_file/space_file.c @@ -29,10 +29,6 @@ #include <string.h> #include <stdio.h> -#include "DNA_object_types.h" -#include "DNA_space_types.h" -#include "DNA_scene_types.h" -#include "DNA_screen_types.h" #include "RNA_access.h" @@ -51,7 +47,6 @@ #include "BKE_context.h" #include "BKE_screen.h" -#include "ED_space_api.h" #include "ED_screen.h" #include "ED_fileselect.h" @@ -61,13 +56,10 @@ #include "WM_api.h" #include "WM_types.h" -#include "UI_interface.h" #include "UI_resources.h" #include "UI_view2d.h" -#include "ED_markers.h" -#include "ED_fileselect.h" #include "file_intern.h" // own include #include "fsmenu.h" diff --git a/source/blender/editors/space_file/writeimage.c b/source/blender/editors/space_file/writeimage.c index 5045bfb21bf..39a986aca32 100644 --- a/source/blender/editors/space_file/writeimage.c +++ b/source/blender/editors/space_file/writeimage.c @@ -36,11 +36,9 @@ #include "BLI_blenlib.h" -#include "DNA_image_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "DNA_texture_types.h" #include "BKE_context.h" #include "BKE_global.h" diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c index c2cf3233f67..ed5de247487 100644 --- a/source/blender/editors/space_graph/graph_buttons.c +++ b/source/blender/editors/space_graph/graph_buttons.c @@ -32,12 +32,8 @@ #include <float.h> #include "DNA_anim_types.h" -#include "DNA_action_types.h" #include "DNA_object_types.h" -#include "DNA_space_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_userdef_types.h" #include "MEM_guardedalloc.h" @@ -66,17 +62,13 @@ #include "WM_types.h" #include "RNA_access.h" -#include "RNA_define.h" #include "ED_anim_api.h" #include "ED_keyframing.h" #include "ED_screen.h" -#include "ED_types.h" -#include "ED_util.h" #include "UI_interface.h" #include "UI_resources.h" -#include "UI_view2d.h" #include "graph_intern.h" // own include diff --git a/source/blender/editors/space_graph/graph_draw.c b/source/blender/editors/space_graph/graph_draw.c index 8315ee740cd..84df407109d 100644 --- a/source/blender/editors/space_graph/graph_draw.c +++ b/source/blender/editors/space_graph/graph_draw.c @@ -45,23 +45,10 @@ #include "BLI_math.h" #include "DNA_anim_types.h" -#include "DNA_action_types.h" -#include "DNA_camera_types.h" -#include "DNA_curve_types.h" -#include "DNA_key_types.h" -#include "DNA_lamp_types.h" -#include "DNA_material_types.h" -#include "DNA_meta_types.h" #include "DNA_object_types.h" -#include "DNA_particle_types.h" -#include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "DNA_sequence_types.h" -#include "DNA_userdef_types.h" -#include "DNA_view2d_types.h" #include "DNA_windowmanager_types.h" -#include "DNA_world_types.h" #include "BKE_animsys.h" #include "BKE_context.h" @@ -78,12 +65,10 @@ #include "BIF_glutil.h" #include "ED_anim_api.h" -#include "ED_util.h" #include "graph_intern.h" #include "UI_interface.h" -#include "UI_interface_icons.h" #include "UI_resources.h" #include "UI_view2d.h" diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c index d23bafbc001..943f31f111b 100644 --- a/source/blender/editors/space_graph/graph_edit.c +++ b/source/blender/editors/space_graph/graph_edit.c @@ -44,21 +44,8 @@ #include "BLI_math.h" #include "DNA_anim_types.h" -#include "DNA_action_types.h" -#include "DNA_armature_types.h" -#include "DNA_camera_types.h" -#include "DNA_curve_types.h" #include "DNA_object_types.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" -#include "DNA_space_types.h" -#include "DNA_constraint_types.h" -#include "DNA_key_types.h" -#include "DNA_lamp_types.h" -#include "DNA_material_types.h" -#include "DNA_userdef_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_windowmanager_types.h" #include "RNA_access.h" #include "RNA_define.h" @@ -80,10 +67,8 @@ #include "ED_anim_api.h" #include "ED_keyframing.h" -#include "ED_keyframes_draw.h" #include "ED_keyframes_edit.h" #include "ED_screen.h" -#include "ED_space_api.h" #include "ED_transform.h" #include "WM_api.h" diff --git a/source/blender/editors/space_graph/graph_ops.c b/source/blender/editors/space_graph/graph_ops.c index e56a758f2b0..b8b3dc97edf 100644 --- a/source/blender/editors/space_graph/graph_ops.c +++ b/source/blender/editors/space_graph/graph_ops.c @@ -31,12 +31,7 @@ #include "MEM_guardedalloc.h" -#include "DNA_listBase.h" -#include "DNA_action_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" -#include "DNA_windowmanager_types.h" #include "BLI_blenlib.h" @@ -44,7 +39,6 @@ #include "BKE_sound.h" #include "BKE_utildefines.h" -#include "UI_interface.h" #include "UI_view2d.h" #include "ED_screen.h" diff --git a/source/blender/editors/space_graph/graph_select.c b/source/blender/editors/space_graph/graph_select.c index 00d9d032840..8cb124422cb 100644 --- a/source/blender/editors/space_graph/graph_select.c +++ b/source/blender/editors/space_graph/graph_select.c @@ -39,21 +39,10 @@ #include "BLI_math.h" #include "DNA_anim_types.h" -#include "DNA_action_types.h" -#include "DNA_armature_types.h" -#include "DNA_camera_types.h" -#include "DNA_curve_types.h" #include "DNA_object_types.h" #include "DNA_screen_types.h" #include "DNA_scene_types.h" #include "DNA_space_types.h" -#include "DNA_constraint_types.h" -#include "DNA_key_types.h" -#include "DNA_lamp_types.h" -#include "DNA_material_types.h" -#include "DNA_userdef_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_windowmanager_types.h" #include "RNA_access.h" #include "RNA_define.h" @@ -71,12 +60,8 @@ #include "UI_view2d.h" #include "ED_anim_api.h" -#include "ED_keyframing.h" -#include "ED_keyframes_draw.h" #include "ED_keyframes_edit.h" #include "ED_markers.h" -#include "ED_screen.h" -#include "ED_space_api.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_graph/graph_utils.c b/source/blender/editors/space_graph/graph_utils.c index b0280e682cc..ad96370e4fa 100644 --- a/source/blender/editors/space_graph/graph_utils.c +++ b/source/blender/editors/space_graph/graph_utils.c @@ -32,12 +32,8 @@ #include <float.h> #include "DNA_anim_types.h" -#include "DNA_action_types.h" -#include "DNA_object_types.h" #include "DNA_space_types.h" -#include "DNA_scene_types.h" #include "DNA_screen_types.h" -#include "DNA_userdef_types.h" #include "MEM_guardedalloc.h" @@ -62,20 +58,10 @@ #include "BIF_gl.h" #include "WM_api.h" -#include "WM_types.h" -#include "RNA_access.h" -#include "RNA_define.h" #include "ED_anim_api.h" -#include "ED_keyframing.h" -#include "ED_screen.h" -#include "ED_types.h" -#include "ED_util.h" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" #include "graph_intern.h" // own include diff --git a/source/blender/editors/space_graph/space_graph.c b/source/blender/editors/space_graph/space_graph.c index 7d34a91d6fa..2c66cb51fba 100644 --- a/source/blender/editors/space_graph/space_graph.c +++ b/source/blender/editors/space_graph/space_graph.c @@ -30,10 +30,7 @@ #include <stdio.h> #include "DNA_anim_types.h" -#include "DNA_object_types.h" -#include "DNA_space_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" #include "MEM_guardedalloc.h" @@ -48,7 +45,6 @@ #include "BKE_screen.h" #include "BKE_utildefines.h" -#include "ED_space_api.h" #include "ED_screen.h" #include "ED_anim_api.h" #include "ED_markers.h" @@ -58,7 +54,6 @@ #include "WM_api.h" #include "WM_types.h" -#include "UI_interface.h" #include "UI_resources.h" #include "UI_view2d.h" diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index 8b1450f3713..6f96de1bae0 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -29,17 +29,10 @@ #include <string.h> #include <stdio.h> -#include "DNA_color_types.h" -#include "DNA_image_types.h" -#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "DNA_packedFile_types.h" #include "DNA_node_types.h" -#include "DNA_space_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_userdef_types.h" #include "MEM_guardedalloc.h" @@ -69,11 +62,8 @@ #include "ED_gpencil.h" #include "ED_image.h" -#include "ED_mesh.h" -#include "ED_space_api.h" #include "ED_screen.h" #include "ED_uvedit.h" -#include "ED_util.h" #include "BIF_gl.h" #include "BIF_glutil.h" @@ -85,7 +75,6 @@ #include "UI_interface.h" #include "UI_resources.h" -#include "UI_view2d.h" #include "image_intern.h" diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c index 0baa81fc699..33dfc99602e 100644 --- a/source/blender/editors/space_image/image_draw.c +++ b/source/blender/editors/space_image/image_draw.c @@ -31,9 +31,7 @@ #include "MEM_guardedalloc.h" -#include "DNA_brush_types.h" #include "DNA_camera_types.h" -#include "DNA_image_types.h" #include "DNA_object_types.h" #include "DNA_space_types.h" #include "DNA_scene_types.h" @@ -56,13 +54,11 @@ #include "ED_gpencil.h" #include "ED_image.h" -#include "ED_screen.h" #include "UI_interface.h" #include "UI_resources.h" #include "UI_view2d.h" -#include "WM_api.h" #include "image_intern.h" diff --git a/source/blender/editors/space_image/image_header.c b/source/blender/editors/space_image/image_header.c index c851aa442eb..8a0e9878572 100644 --- a/source/blender/editors/space_image/image_header.c +++ b/source/blender/editors/space_image/image_header.c @@ -30,11 +30,7 @@ #include <stdio.h> #include "DNA_object_types.h" -#include "DNA_mesh_types.h" -#include "DNA_customdata_types.h" #include "DNA_space_types.h" -#include "DNA_scene_types.h" -#include "DNA_screen_types.h" #include "DNA_windowmanager_types.h" #include "MEM_guardedalloc.h" @@ -49,29 +45,17 @@ #include "BKE_screen.h" #include "BKE_utildefines.h" -#include "IMB_imbuf.h" -#include "IMB_imbuf_types.h" #include "ED_image.h" -#include "ED_mesh.h" -#include "ED_screen.h" -#include "ED_transform.h" -#include "ED_types.h" -#include "ED_util.h" -#include "WM_api.h" #include "WM_types.h" #include "BIF_gl.h" #include "BIF_glutil.h" #include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" -#include "RNA_access.h" -#include "RE_pipeline.h" #include "image_intern.h" diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 386259278df..68ba83b4000 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -30,16 +30,9 @@ #include "MEM_guardedalloc.h" -#include "DNA_image_types.h" -#include "DNA_node_types.h" #include "DNA_object_types.h" #include "DNA_packedFile_types.h" -#include "DNA_space_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_texture_types.h" -#include "DNA_userdef_types.h" -#include "DNA_windowmanager_types.h" #include "BKE_colortools.h" #include "BKE_context.h" @@ -63,7 +56,6 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "RNA_types.h" #include "RNA_enum_types.h" #include "ED_image.h" diff --git a/source/blender/editors/space_image/image_render.c b/source/blender/editors/space_image/image_render.c index 97b5f9847ff..18e42ce8797 100644 --- a/source/blender/editors/space_image/image_render.c +++ b/source/blender/editors/space_image/image_render.c @@ -28,7 +28,6 @@ #include <stdlib.h> #include <stdio.h> -#include "DNA_image_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" @@ -40,11 +39,9 @@ #include "BIF_gl.h" #include "BIF_glutil.h" -#include "ED_screen.h" #include "RE_pipeline.h" -#include "WM_api.h" #define HEADER_HEIGHT 18 diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index 8d2e54e0fca..30f173bd149 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -29,13 +29,9 @@ #include <string.h> #include <stdio.h> -#include "DNA_image_types.h" -#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "DNA_space_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" #include "MEM_guardedalloc.h" @@ -51,11 +47,8 @@ #include "BKE_screen.h" #include "BKE_utildefines.h" -#include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "ED_gpencil.h" -#include "ED_image.h" #include "ED_mesh.h" #include "ED_space_api.h" #include "ED_screen.h" @@ -69,7 +62,6 @@ #include "WM_api.h" #include "WM_types.h" -#include "UI_interface.h" #include "UI_resources.h" #include "UI_view2d.h" diff --git a/source/blender/editors/space_info/info_ops.c b/source/blender/editors/space_info/info_ops.c index 072c5bf1573..e2baeb9abac 100644 --- a/source/blender/editors/space_info/info_ops.c +++ b/source/blender/editors/space_info/info_ops.c @@ -31,9 +31,6 @@ #include "DNA_packedFile_types.h" #include "DNA_space_types.h" -#include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_userdef_types.h" #include "DNA_windowmanager_types.h" #include "MEM_guardedalloc.h" @@ -49,9 +46,6 @@ #include "BKE_report.h" #include "BKE_screen.h" -#include "ED_screen.h" -#include "ED_types.h" -#include "ED_util.h" #include "WM_api.h" #include "WM_types.h" @@ -60,14 +54,12 @@ #include "BIF_glutil.h" #include "UI_interface.h" -#include "UI_resources.h" #include "IMB_imbuf_types.h" #include "RNA_access.h" #include "RNA_define.h" -#include "WM_types.h" #include "info_intern.h" diff --git a/source/blender/editors/space_info/info_stats.c b/source/blender/editors/space_info/info_stats.c index e3aa0e2e3e7..cf23c488960 100644 --- a/source/blender/editors/space_info/info_stats.c +++ b/source/blender/editors/space_info/info_stats.c @@ -27,15 +27,11 @@ #include "MEM_guardedalloc.h" -#include "DNA_action_types.h" #include "DNA_armature_types.h" #include "DNA_curve_types.h" #include "DNA_group_types.h" #include "DNA_lattice_types.h" -#include "DNA_mesh_types.h" #include "DNA_meta_types.h" -#include "DNA_object_types.h" -#include "DNA_particle_types.h" #include "DNA_scene_types.h" #include "BKE_anim.h" diff --git a/source/blender/editors/space_info/space_info.c b/source/blender/editors/space_info/space_info.c index f6cc25e9074..6c172c13138 100644 --- a/source/blender/editors/space_info/space_info.c +++ b/source/blender/editors/space_info/space_info.c @@ -29,10 +29,6 @@ #include <string.h> #include <stdio.h> -#include "DNA_object_types.h" -#include "DNA_space_types.h" -#include "DNA_scene_types.h" -#include "DNA_screen_types.h" #include "MEM_guardedalloc.h" @@ -45,7 +41,6 @@ #include "BKE_screen.h" #include "BKE_utildefines.h" -#include "ED_space_api.h" #include "ED_screen.h" #include "BIF_gl.h" @@ -53,12 +48,8 @@ #include "WM_api.h" #include "WM_types.h" -#include "UI_interface.h" #include "UI_resources.h" -#include "UI_view2d.h" -#include "ED_markers.h" -#include "ED_object.h" #include "info_intern.h" // own include diff --git a/source/blender/editors/space_logic/logic_buttons.c b/source/blender/editors/space_logic/logic_buttons.c index 3d7624a25dc..fc0955bf9d1 100644 --- a/source/blender/editors/space_logic/logic_buttons.c +++ b/source/blender/editors/space_logic/logic_buttons.c @@ -28,11 +28,6 @@ #include <stdio.h> #include "DNA_object_types.h" -#include "DNA_node_types.h" -#include "DNA_space_types.h" -#include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_userdef_types.h" #include "MEM_guardedalloc.h" @@ -48,9 +43,7 @@ #include "BKE_screen.h" #include "BKE_utildefines.h" -#include "ED_space_api.h" #include "ED_screen.h" -#include "ED_util.h" #include "BIF_gl.h" #include "BIF_glutil.h" @@ -62,7 +55,6 @@ #include "WM_types.h" #include "UI_interface.h" -#include "UI_resources.h" #include "UI_view2d.h" #include "interface_intern.h" diff --git a/source/blender/editors/space_logic/logic_header.c b/source/blender/editors/space_logic/logic_header.c index 789c00a6aa5..3e38eb815fb 100644 --- a/source/blender/editors/space_logic/logic_header.c +++ b/source/blender/editors/space_logic/logic_header.c @@ -29,10 +29,6 @@ #include <string.h> #include <stdio.h> -#include "DNA_space_types.h" -#include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_windowmanager_types.h" #include "MEM_guardedalloc.h" @@ -46,8 +42,6 @@ #include "ED_types.h" #include "ED_util.h" -#include "WM_api.h" -#include "WM_types.h" #include "BIF_gl.h" #include "BIF_glutil.h" diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c index 0a86839fc4a..39d3feafc19 100644 --- a/source/blender/editors/space_logic/logic_window.c +++ b/source/blender/editors/space_logic/logic_window.c @@ -33,16 +33,12 @@ #include "DNA_actuator_types.h" #include "DNA_controller_types.h" -#include "DNA_object_types.h" #include "DNA_property_types.h" #include "DNA_space_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_sensor_types.h" -#include "DNA_sound_types.h" -#include "DNA_armature_types.h" #include "DNA_constraint_types.h" -#include "DNA_action_types.h" #include "DNA_windowmanager_types.h" #include "MEM_guardedalloc.h" @@ -58,19 +54,14 @@ #include "BKE_sca.h" #include "BKE_utildefines.h" -#include "ED_screen.h" -#include "ED_types.h" #include "ED_util.h" -#include "WM_api.h" #include "WM_types.h" #include "BIF_gl.h" #include "BIF_glutil.h" #include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" /* XXX BAD BAD */ #include "../interface/interface_intern.h" diff --git a/source/blender/editors/space_logic/space_logic.c b/source/blender/editors/space_logic/space_logic.c index 8c5ccdd9a5d..e15d68b36a5 100644 --- a/source/blender/editors/space_logic/space_logic.c +++ b/source/blender/editors/space_logic/space_logic.c @@ -29,13 +29,6 @@ #include <string.h> #include <stdio.h> -#include "DNA_image_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" -#include "DNA_object_types.h" -#include "DNA_space_types.h" -#include "DNA_scene_types.h" -#include "DNA_screen_types.h" #include "MEM_guardedalloc.h" @@ -46,18 +39,15 @@ #include "BKE_screen.h" #include "BKE_utildefines.h" -#include "ED_space_api.h" #include "ED_screen.h" #include "BIF_gl.h" #include "BIF_glutil.h" -#include "RNA_access.h" #include "WM_api.h" #include "WM_types.h" -#include "UI_interface.h" #include "UI_resources.h" #include "UI_view2d.h" diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index 957529942c0..5ed7217bcbd 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -32,12 +32,6 @@ #include <float.h> #include "DNA_anim_types.h" -#include "DNA_action_types.h" -#include "DNA_object_types.h" -#include "DNA_space_types.h" -#include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_userdef_types.h" #include "MEM_guardedalloc.h" @@ -66,17 +60,12 @@ #include "WM_types.h" #include "RNA_access.h" -#include "RNA_define.h" #include "ED_anim_api.h" -#include "ED_keyframing.h" #include "ED_screen.h" -#include "ED_types.h" -#include "ED_util.h" #include "UI_interface.h" #include "UI_resources.h" -#include "UI_view2d.h" #include "nla_intern.h" // own include diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c index 1bc07811bf8..4deab9d82ab 100644 --- a/source/blender/editors/space_nla/nla_channels.c +++ b/source/blender/editors/space_nla/nla_channels.c @@ -31,24 +31,9 @@ #include <stdlib.h> #include <math.h> -#include "DNA_listBase.h" #include "DNA_anim_types.h" -#include "DNA_action_types.h" -#include "DNA_armature_types.h" -#include "DNA_camera_types.h" -#include "DNA_curve_types.h" #include "DNA_object_types.h" -#include "DNA_particle_types.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" -#include "DNA_space_types.h" -#include "DNA_key_types.h" -#include "DNA_lamp_types.h" -#include "DNA_material_types.h" -#include "DNA_meta_types.h" -#include "DNA_userdef_types.h" -#include "DNA_windowmanager_types.h" -#include "DNA_world_types.h" #include "MEM_guardedalloc.h" @@ -65,8 +50,6 @@ #include "ED_anim_api.h" #include "ED_keyframes_edit.h" -#include "ED_markers.h" -#include "ED_space_api.h" #include "ED_screen.h" #include "RNA_access.h" @@ -75,9 +58,6 @@ #include "WM_api.h" #include "WM_types.h" -#include "UI_interface.h" -#include "UI_interface_icons.h" -#include "UI_resources.h" #include "UI_view2d.h" #include "nla_intern.h" // own include diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c index 5b9b5331223..2ec88ba852f 100644 --- a/source/blender/editors/space_nla/nla_draw.c +++ b/source/blender/editors/space_nla/nla_draw.c @@ -32,26 +32,10 @@ #include <math.h> #include <float.h> -#include "DNA_listBase.h" #include "DNA_anim_types.h" -#include "DNA_action_types.h" -#include "DNA_armature_types.h" -#include "DNA_camera_types.h" -#include "DNA_curve_types.h" -#include "DNA_object_types.h" #include "DNA_screen_types.h" -#include "DNA_scene_types.h" #include "DNA_space_types.h" -#include "DNA_constraint_types.h" -#include "DNA_key_types.h" -#include "DNA_lamp_types.h" -#include "DNA_material_types.h" -#include "DNA_meta_types.h" -#include "DNA_particle_types.h" -#include "DNA_userdef_types.h" #include "DNA_windowmanager_types.h" -#include "DNA_world_types.h" -#include "DNA_vec_types.h" #include "MEM_guardedalloc.h" @@ -69,13 +53,10 @@ #include "ED_anim_api.h" #include "ED_keyframes_draw.h" -#include "ED_space_api.h" -#include "ED_screen.h" #include "BIF_gl.h" #include "BIF_glutil.h" -#include "WM_api.h" #include "WM_types.h" #include "UI_interface.h" @@ -83,7 +64,6 @@ #include "UI_resources.h" #include "UI_view2d.h" -#include "ED_markers.h" #include "nla_intern.h" // own include diff --git a/source/blender/editors/space_nla/nla_edit.c b/source/blender/editors/space_nla/nla_edit.c index a26d6b84e08..4fd62ea20d0 100644 --- a/source/blender/editors/space_nla/nla_edit.c +++ b/source/blender/editors/space_nla/nla_edit.c @@ -31,13 +31,7 @@ #include <math.h> #include "DNA_anim_types.h" -#include "DNA_action_types.h" -#include "DNA_nla_types.h" -#include "DNA_object_types.h" -#include "DNA_space_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_windowmanager_types.h" #include "MEM_guardedalloc.h" @@ -59,7 +53,6 @@ #include "ED_anim_api.h" #include "ED_keyframes_edit.h" #include "ED_markers.h" -#include "ED_space_api.h" #include "ED_screen.h" #include "ED_transform.h" @@ -71,8 +64,6 @@ #include "WM_types.h" #include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" #include "nla_intern.h" // own include #include "nla_private.h" // FIXME... maybe this shouldn't be included? diff --git a/source/blender/editors/space_nla/nla_ops.c b/source/blender/editors/space_nla/nla_ops.c index 0880c71059e..71701048e2f 100644 --- a/source/blender/editors/space_nla/nla_ops.c +++ b/source/blender/editors/space_nla/nla_ops.c @@ -29,14 +29,7 @@ #include <string.h> #include <stdio.h> -#include "DNA_anim_types.h" -#include "DNA_action_types.h" -#include "DNA_nla_types.h" -#include "DNA_object_types.h" -#include "DNA_space_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_windowmanager_types.h" #include "MEM_guardedalloc.h" @@ -51,7 +44,6 @@ #include "BKE_screen.h" #include "ED_anim_api.h" -#include "ED_space_api.h" #include "ED_screen.h" #include "ED_transform.h" @@ -60,9 +52,6 @@ #include "RNA_access.h" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" #include "nla_intern.h" // own include diff --git a/source/blender/editors/space_nla/nla_select.c b/source/blender/editors/space_nla/nla_select.c index deb7fd5cd79..b76d90bd0f9 100644 --- a/source/blender/editors/space_nla/nla_select.c +++ b/source/blender/editors/space_nla/nla_select.c @@ -30,13 +30,7 @@ #include <stdio.h> #include "DNA_anim_types.h" -#include "DNA_action_types.h" -#include "DNA_nla_types.h" -#include "DNA_object_types.h" -#include "DNA_space_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_windowmanager_types.h" #include "MEM_guardedalloc.h" @@ -52,8 +46,6 @@ #include "ED_anim_api.h" #include "ED_keyframes_edit.h" -#include "ED_markers.h" -#include "ED_space_api.h" #include "ED_screen.h" #include "RNA_access.h" @@ -62,8 +54,6 @@ #include "WM_api.h" #include "WM_types.h" -#include "UI_interface.h" -#include "UI_resources.h" #include "UI_view2d.h" #include "nla_intern.h" // own include diff --git a/source/blender/editors/space_nla/space_nla.c b/source/blender/editors/space_nla/space_nla.c index 4bebecf60b2..46fec4015ea 100644 --- a/source/blender/editors/space_nla/space_nla.c +++ b/source/blender/editors/space_nla/space_nla.c @@ -30,11 +30,7 @@ #include <stdio.h> #include "DNA_anim_types.h" -#include "DNA_nla_types.h" -#include "DNA_object_types.h" -#include "DNA_space_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" #include "MEM_guardedalloc.h" @@ -54,7 +50,6 @@ #include "ED_anim_api.h" #include "ED_markers.h" -#include "ED_space_api.h" #include "ED_screen.h" #include "BIF_gl.h" @@ -62,7 +57,6 @@ #include "WM_api.h" #include "WM_types.h" -#include "UI_interface.h" #include "UI_resources.h" #include "UI_view2d.h" diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 3d907b49940..04b9d86f8cc 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -34,23 +34,12 @@ #include "BLI_blenlib.h" #include "BLI_math.h" -#include "DNA_ID.h" #include "DNA_node_types.h" -#include "DNA_image_types.h" #include "DNA_material_types.h" -#include "DNA_mesh_types.h" -#include "DNA_action_types.h" -#include "DNA_color_types.h" -#include "DNA_customdata_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_ipo_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_space_types.h" #include "DNA_screen_types.h" -#include "DNA_texture_types.h" -#include "DNA_text_types.h" -#include "DNA_userdef_types.h" #include "BKE_context.h" #include "BKE_curve.h" @@ -73,22 +62,15 @@ #include "MEM_guardedalloc.h" -#include "ED_node.h" -#include "ED_space_api.h" -#include "ED_screen.h" -#include "ED_types.h" #include "RNA_access.h" -#include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" -#include "UI_view2d.h" #include "UI_interface.h" #include "UI_resources.h" -#include "RE_pipeline.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/editors/space_node/node_buttons.c b/source/blender/editors/space_node/node_buttons.c index 317bce16f07..a1abb21c97f 100644 --- a/source/blender/editors/space_node/node_buttons.c +++ b/source/blender/editors/space_node/node_buttons.c @@ -31,13 +31,8 @@ #include <math.h> #include <float.h> -#include "DNA_ID.h" -#include "DNA_gpencil_types.h" #include "DNA_node_types.h" -#include "DNA_space_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_userdef_types.h" #include "MEM_guardedalloc.h" @@ -61,16 +56,12 @@ #include "WM_types.h" #include "RNA_access.h" -#include "RNA_define.h" #include "ED_gpencil.h" #include "ED_screen.h" -#include "ED_types.h" -#include "ED_util.h" #include "UI_interface.h" #include "UI_resources.h" -#include "UI_view2d.h" #include "node_intern.h" // own include diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index 3f53b80bd22..114c1566bae 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -30,23 +30,12 @@ #include <stdio.h> #include <string.h> -#include "DNA_ID.h" #include "DNA_node_types.h" -#include "DNA_image_types.h" #include "DNA_material_types.h" -#include "DNA_mesh_types.h" -#include "DNA_action_types.h" -#include "DNA_color_types.h" -#include "DNA_customdata_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_ipo_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_space_types.h" #include "DNA_screen_types.h" -#include "DNA_texture_types.h" -#include "DNA_text_types.h" -#include "DNA_userdef_types.h" #include "BLI_math.h" #include "BLI_blenlib.h" @@ -73,9 +62,6 @@ #include "WM_types.h" #include "ED_gpencil.h" -#include "ED_screen.h" -#include "ED_util.h" -#include "ED_types.h" #include "UI_interface.h" #include "UI_interface_icons.h" diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index ce0b3f3fd59..eeab6a7f31e 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -34,19 +34,10 @@ #include "MEM_guardedalloc.h" -#include "DNA_action_types.h" -#include "DNA_brush_types.h" -#include "DNA_color_types.h" -#include "DNA_image_types.h" -#include "DNA_ipo_types.h" #include "DNA_object_types.h" #include "DNA_material_types.h" -#include "DNA_texture_types.h" #include "DNA_node_types.h" -#include "DNA_space_types.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" -#include "DNA_userdef_types.h" #include "BKE_context.h" #include "BKE_colortools.h" @@ -70,14 +61,9 @@ #include "RE_pipeline.h" -#include "IMB_imbuf_types.h" #include "ED_node.h" -#include "ED_render.h" #include "ED_screen.h" -#include "ED_space_api.h" -#include "ED_transform.h" -#include "ED_types.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_node/node_header.c b/source/blender/editors/space_node/node_header.c index 168d2524995..3ed719eccc0 100644 --- a/source/blender/editors/space_node/node_header.c +++ b/source/blender/editors/space_node/node_header.c @@ -31,11 +31,8 @@ #include "DNA_space_types.h" #include "DNA_node_types.h" -#include "DNA_material_types.h" -#include "DNA_texture_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" -#include "DNA_windowmanager_types.h" #include "MEM_guardedalloc.h" @@ -47,9 +44,6 @@ #include "BKE_main.h" #include "BKE_utildefines.h" -#include "ED_screen.h" -#include "ED_types.h" -#include "ED_util.h" #include "WM_api.h" #include "WM_types.h" @@ -58,8 +52,6 @@ #include "BIF_glutil.h" #include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" #include "node_intern.h" diff --git a/source/blender/editors/space_node/node_ops.c b/source/blender/editors/space_node/node_ops.c index 171333946d1..dd09260ad97 100644 --- a/source/blender/editors/space_node/node_ops.c +++ b/source/blender/editors/space_node/node_ops.c @@ -27,20 +27,15 @@ */ #include "DNA_node_types.h" -#include "DNA_material_types.h" -#include "DNA_texture_types.h" #include "DNA_scene_types.h" -#include "DNA_space_types.h" #include "BKE_context.h" #include "BKE_node.h" -#include "ED_space_api.h" #include "ED_screen.h" #include "ED_transform.h" #include "RNA_access.h" -#include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_node/node_select.c b/source/blender/editors/space_node/node_select.c index d55b703619b..b690059fc12 100644 --- a/source/blender/editors/space_node/node_select.c +++ b/source/blender/editors/space_node/node_select.c @@ -29,11 +29,7 @@ #include <stdio.h> #include "DNA_node_types.h" -#include "DNA_material_types.h" -#include "DNA_texture_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" #include "BKE_context.h" #include "BKE_node.h" @@ -42,7 +38,6 @@ #include "BLI_rect.h" -#include "ED_space_api.h" #include "ED_screen.h" #include "ED_types.h" diff --git a/source/blender/editors/space_node/node_state.c b/source/blender/editors/space_node/node_state.c index 0d7c182bc9e..43c80f693b1 100644 --- a/source/blender/editors/space_node/node_state.c +++ b/source/blender/editors/space_node/node_state.c @@ -29,11 +29,7 @@ #include <stdio.h> #include "DNA_node_types.h" -#include "DNA_material_types.h" -#include "DNA_texture_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" #include "BKE_context.h" #include "BKE_node.h" @@ -41,9 +37,7 @@ #include "BLI_rect.h" -#include "ED_space_api.h" #include "ED_screen.h" -#include "ED_types.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c index 6a261957c83..afb2ec04f55 100644 --- a/source/blender/editors/space_node/space_node.c +++ b/source/blender/editors/space_node/space_node.c @@ -32,10 +32,7 @@ #include "DNA_node_types.h" #include "DNA_object_types.h" #include "DNA_material_types.h" -#include "DNA_texture_types.h" -#include "DNA_space_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" #include "MEM_guardedalloc.h" @@ -49,7 +46,6 @@ #include "BKE_node.h" #include "ED_render.h" -#include "ED_space_api.h" #include "ED_screen.h" #include "BIF_gl.h" @@ -57,8 +53,6 @@ #include "WM_api.h" #include "WM_types.h" -#include "UI_interface.h" -#include "UI_resources.h" #include "UI_view2d.h" #include "RNA_access.h" diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c index f5ef9a6ba75..44baea0737f 100644 --- a/source/blender/editors/space_outliner/outliner.c +++ b/source/blender/editors/space_outliner/outliner.c @@ -34,29 +34,17 @@ #include "MEM_guardedalloc.h" #include "DNA_anim_types.h" -#include "DNA_action_types.h" #include "DNA_armature_types.h" #include "DNA_constraint_types.h" -#include "DNA_curve_types.h" #include "DNA_camera_types.h" -#include "DNA_image_types.h" -#include "DNA_ipo_types.h" #include "DNA_group_types.h" #include "DNA_key_types.h" #include "DNA_lamp_types.h" #include "DNA_material_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" -#include "DNA_modifier_types.h" -#include "DNA_nla_types.h" -#include "DNA_object_types.h" -#include "DNA_outliner_types.h" #include "DNA_particle_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" -#include "DNA_texture_types.h" -#include "DNA_text_types.h" #include "DNA_world_types.h" #include "DNA_sequence_types.h" @@ -87,7 +75,6 @@ #include "ED_object.h" #include "ED_screen.h" #include "ED_util.h" -#include "ED_types.h" #include "WM_api.h" #include "WM_types.h" @@ -103,16 +90,10 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "ED_armature.h" #include "ED_keyframing.h" -#include "ED_object.h" -#include "ED_particle.h" -#include "ED_screen.h" -#include "ED_view3d.h" #include "outliner_intern.h" -#include "PIL_time.h" #define OL_H 19 diff --git a/source/blender/editors/space_outliner/outliner_ops.c b/source/blender/editors/space_outliner/outliner_ops.c index adcacbe55c8..fcd6e272390 100644 --- a/source/blender/editors/space_outliner/outliner_ops.c +++ b/source/blender/editors/space_outliner/outliner_ops.c @@ -29,15 +29,12 @@ #include <stdlib.h> #include "DNA_space_types.h" -#include "DNA_windowmanager_types.h" #include "WM_api.h" #include "WM_types.h" #include "RNA_access.h" -#include "RNA_define.h" -#include "ED_screen.h" #include "outliner_intern.h" diff --git a/source/blender/editors/space_outliner/space_outliner.c b/source/blender/editors/space_outliner/space_outliner.c index 27d6c83cdb8..63508725b05 100644 --- a/source/blender/editors/space_outliner/space_outliner.c +++ b/source/blender/editors/space_outliner/space_outliner.c @@ -29,16 +29,6 @@ #include <string.h> #include <stdio.h> -#include "DNA_color_types.h" -#include "DNA_object_types.h" -#include "DNA_outliner_types.h" -#include "DNA_space_types.h" -#include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" -#include "DNA_texture_types.h" -#include "DNA_vec_types.h" -#include "DNA_windowmanager_types.h" #include "MEM_guardedalloc.h" @@ -52,7 +42,6 @@ #include "BKE_texture.h" #include "BKE_utildefines.h" -#include "ED_space_api.h" #include "ED_screen.h" #include "WM_api.h" @@ -61,12 +50,9 @@ #include "BIF_gl.h" #include "BIF_glutil.h" -#include "UI_interface.h" #include "UI_resources.h" #include "UI_view2d.h" -#include "RNA_access.h" -#include "RNA_types.h" #include "outliner_intern.h" diff --git a/source/blender/editors/space_script/script_edit.c b/source/blender/editors/space_script/script_edit.c index 5a1ca49e79d..6ef9a96b478 100644 --- a/source/blender/editors/space_script/script_edit.c +++ b/source/blender/editors/space_script/script_edit.c @@ -29,9 +29,6 @@ #include <string.h> #include <stdio.h> -#include "DNA_space_types.h" -#include "DNA_screen_types.h" -#include "DNA_userdef_types.h" #include "MEM_guardedalloc.h" @@ -49,10 +46,7 @@ #include "RNA_define.h" #include "ED_screen.h" -#include "ED_types.h" -#include "UI_interface.h" -#include "UI_resources.h" #include "script_intern.h" // own include diff --git a/source/blender/editors/space_script/script_header.c b/source/blender/editors/space_script/script_header.c index 2c08fd97bac..9c23d1b8131 100644 --- a/source/blender/editors/space_script/script_header.c +++ b/source/blender/editors/space_script/script_header.c @@ -29,10 +29,6 @@ #include <string.h> #include <stdio.h> -#include "DNA_space_types.h" -#include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_windowmanager_types.h" #include "MEM_guardedalloc.h" @@ -45,8 +41,6 @@ #include "ED_types.h" #include "ED_util.h" -#include "WM_api.h" -#include "WM_types.h" #include "BIF_gl.h" #include "BIF_glutil.h" diff --git a/source/blender/editors/space_script/script_ops.c b/source/blender/editors/space_script/script_ops.c index b3b0c40df07..353d80f1921 100644 --- a/source/blender/editors/space_script/script_ops.c +++ b/source/blender/editors/space_script/script_ops.c @@ -31,11 +31,8 @@ #include "MEM_guardedalloc.h" -#include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "DNA_userdef_types.h" -#include "DNA_windowmanager_types.h" #include "BLI_math.h" #include "BLI_blenlib.h" @@ -45,12 +42,10 @@ #include "BKE_utildefines.h" #include "RNA_access.h" -#include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" -#include "ED_screen.h" #include "script_intern.h" diff --git a/source/blender/editors/space_script/space_script.c b/source/blender/editors/space_script/space_script.c index cca9e0efbd1..3629c980a25 100644 --- a/source/blender/editors/space_script/space_script.c +++ b/source/blender/editors/space_script/space_script.c @@ -29,10 +29,6 @@ #include <string.h> #include <stdio.h> -#include "DNA_object_types.h" -#include "DNA_space_types.h" -#include "DNA_scene_types.h" -#include "DNA_screen_types.h" #include "MEM_guardedalloc.h" @@ -44,7 +40,6 @@ #include "BKE_context.h" #include "BKE_screen.h" -#include "ED_space_api.h" #include "ED_screen.h" #include "BIF_gl.h" @@ -52,11 +47,9 @@ #include "WM_api.h" #include "WM_types.h" -#include "UI_interface.h" #include "UI_resources.h" #include "UI_view2d.h" -#include "ED_markers.h" #include "BPY_extern.h" diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index 439fd6c13d1..22d94621673 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -41,18 +41,8 @@ #include "BLI_math.h" #include "BLI_storage_types.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" -#include "DNA_ipo_types.h" -#include "DNA_curve_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" -#include "DNA_sequence_types.h" -#include "DNA_view2d_types.h" -#include "DNA_userdef_types.h" -#include "DNA_sound_types.h" #include "BKE_context.h" #include "BKE_global.h" @@ -71,23 +61,13 @@ #include "WM_api.h" #include "WM_types.h" -#include "RNA_access.h" #include "RNA_define.h" #include "RNA_enum_types.h" /* for menu/popup icons etc etc*/ -#include "UI_interface.h" -#include "UI_resources.h" -#include "ED_anim_api.h" -#include "ED_space_api.h" -#include "ED_types.h" #include "ED_screen.h" -#include "ED_util.h" -#include "ED_fileselect.h" -#include "UI_interface.h" -#include "UI_resources.h" #include "UI_view2d.h" #include "BKE_sound.h" diff --git a/source/blender/editors/space_sequencer/sequencer_buttons.c b/source/blender/editors/space_sequencer/sequencer_buttons.c index d6b52e83090..a2aa7e649b9 100644 --- a/source/blender/editors/space_sequencer/sequencer_buttons.c +++ b/source/blender/editors/space_sequencer/sequencer_buttons.c @@ -27,11 +27,6 @@ #include <string.h> #include <stdio.h> -#include "DNA_object_types.h" -#include "DNA_space_types.h" -#include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_userdef_types.h" #include "MEM_guardedalloc.h" @@ -43,21 +38,14 @@ #include "BKE_screen.h" #include "BKE_utildefines.h" -#include "IMB_imbuf.h" -#include "IMB_imbuf_types.h" #include "ED_screen.h" -#include "ED_sequencer.h" -#include "ED_util.h" -#include "RNA_access.h" #include "WM_api.h" #include "WM_types.h" #include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" #include "sequencer_intern.h" diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index ce4c0b6a8a4..d725c5c81b4 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -35,12 +35,9 @@ #include "IMB_imbuf_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_sequence_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "DNA_view2d_types.h" #include "DNA_userdef_types.h" #include "BKE_context.h" @@ -51,7 +48,6 @@ #include "BKE_utildefines.h" #include "BKE_sound.h" -#include "IMB_imbuf_types.h" #include "IMB_imbuf.h" #include "BIF_gl.h" @@ -59,8 +55,6 @@ #include "ED_anim_api.h" #include "ED_markers.h" -#include "ED_space_api.h" -#include "ED_sequencer.h" #include "ED_types.h" #include "UI_interface.h" diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 3cdbc70211f..de0b048e9d5 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -42,18 +42,10 @@ #include "BLI_math.h" #include "BLI_storage_types.h" -#include "IMB_imbuf_types.h" -#include "IMB_imbuf.h" #include "DNA_ipo_types.h" -#include "DNA_curve_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" -#include "DNA_sequence_types.h" -#include "DNA_view2d_types.h" #include "DNA_userdef_types.h" -#include "DNA_sound_types.h" #include "BKE_context.h" #include "BKE_global.h" @@ -70,23 +62,14 @@ #include "WM_api.h" #include "WM_types.h" -#include "RNA_access.h" #include "RNA_define.h" /* for menu/popup icons etc etc*/ -#include "UI_interface.h" -#include "UI_resources.h" -#include "ED_anim_api.h" -#include "ED_space_api.h" -#include "ED_types.h" #include "ED_screen.h" #include "ED_transform.h" -#include "ED_util.h" #include "ED_sequencer.h" -#include "UI_interface.h" -#include "UI_resources.h" #include "UI_view2d.h" /* own include */ diff --git a/source/blender/editors/space_sequencer/sequencer_ops.c b/source/blender/editors/space_sequencer/sequencer_ops.c index b09dd1a9a1e..1d1ee43f400 100644 --- a/source/blender/editors/space_sequencer/sequencer_ops.c +++ b/source/blender/editors/space_sequencer/sequencer_ops.c @@ -32,11 +32,7 @@ #include "MEM_guardedalloc.h" -#include "DNA_scene_types.h" -#include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "DNA_userdef_types.h" -#include "DNA_windowmanager_types.h" #include "BLI_math.h" #include "BLI_blenlib.h" @@ -45,13 +41,10 @@ #include "BKE_global.h" #include "BKE_utildefines.h" -#include "RNA_access.h" -#include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" -#include "ED_screen.h" #include "ED_transform.h" /* transform keymap */ #include "sequencer_intern.h" diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index 437871c7fe8..14e519b125d 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -40,13 +40,7 @@ #include "BLI_blenlib.h" #include "BLI_math.h" -#include "DNA_curve_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" -#include "DNA_sequence_types.h" -#include "DNA_view2d_types.h" -#include "DNA_userdef_types.h" #include "BKE_context.h" #include "BKE_global.h" @@ -59,21 +53,13 @@ #include "WM_api.h" #include "WM_types.h" -#include "RNA_access.h" #include "RNA_define.h" /* for menu/popup icons etc etc*/ -#include "UI_interface.h" -#include "UI_resources.h" -#include "ED_anim_api.h" -#include "ED_space_api.h" #include "ED_types.h" #include "ED_screen.h" -#include "ED_util.h" -#include "UI_interface.h" -#include "UI_resources.h" #include "UI_view2d.h" /* own include */ diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c index 22858c4a849..073743976e8 100644 --- a/source/blender/editors/space_sequencer/space_sequencer.c +++ b/source/blender/editors/space_sequencer/space_sequencer.c @@ -29,7 +29,6 @@ #include <string.h> #include <stdio.h> -#include "DNA_space_types.h" #include "DNA_scene_types.h" #include "MEM_guardedalloc.h" @@ -42,7 +41,6 @@ #include "BKE_sequencer.h" #include "BKE_global.h" -#include "ED_space_api.h" #include "ED_screen.h" #include "ED_view3d.h" /* only for sequencer view3d drawing callback */ diff --git a/source/blender/editors/space_sound/sound_header.c b/source/blender/editors/space_sound/sound_header.c index 2e6bf599692..acc9645af9d 100644 --- a/source/blender/editors/space_sound/sound_header.c +++ b/source/blender/editors/space_sound/sound_header.c @@ -29,10 +29,6 @@ #include <string.h> #include <stdio.h> -#include "DNA_space_types.h" -#include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_windowmanager_types.h" #include "MEM_guardedalloc.h" @@ -45,8 +41,6 @@ #include "ED_types.h" #include "ED_util.h" -#include "WM_api.h" -#include "WM_types.h" #include "BIF_gl.h" #include "BIF_glutil.h" diff --git a/source/blender/editors/space_sound/space_sound.c b/source/blender/editors/space_sound/space_sound.c index c64ea7c6693..8c84002a625 100644 --- a/source/blender/editors/space_sound/space_sound.c +++ b/source/blender/editors/space_sound/space_sound.c @@ -30,10 +30,7 @@ #include <stdio.h> #include "DNA_sound_types.h" -#include "DNA_object_types.h" -#include "DNA_space_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" #include "MEM_guardedalloc.h" @@ -45,7 +42,6 @@ #include "BKE_context.h" #include "BKE_screen.h" -#include "ED_space_api.h" #include "ED_screen.h" #include "BIF_gl.h" @@ -53,11 +49,9 @@ #include "WM_api.h" #include "WM_types.h" -#include "UI_interface.h" #include "UI_resources.h" #include "UI_view2d.h" -#include "ED_markers.h" #include "sound_intern.h" // own include diff --git a/source/blender/editors/space_text/space_text.c b/source/blender/editors/space_text/space_text.c index 43849fda7f8..e4f488fb5c1 100644 --- a/source/blender/editors/space_text/space_text.c +++ b/source/blender/editors/space_text/space_text.c @@ -31,10 +31,6 @@ #include "DNA_text_types.h" #include "DNA_object_types.h" -#include "DNA_space_types.h" -#include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_userdef_types.h" #include "MEM_guardedalloc.h" @@ -46,7 +42,6 @@ #include "BKE_context.h" #include "BKE_screen.h" -#include "ED_space_api.h" #include "ED_screen.h" #include "BIF_gl.h" @@ -60,7 +55,6 @@ #include "RNA_access.h" -#include "ED_markers.h" #include "text_intern.h" // own include diff --git a/source/blender/editors/space_text/text_header.c b/source/blender/editors/space_text/text_header.c index da6bea94258..04f9dd8ac3b 100644 --- a/source/blender/editors/space_text/text_header.c +++ b/source/blender/editors/space_text/text_header.c @@ -42,10 +42,6 @@ #include "BLI_winstuff.h" #endif -#include "DNA_space_types.h" -#include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_text_types.h" #include "DNA_windowmanager_types.h" #include "MEM_guardedalloc.h" @@ -61,20 +57,13 @@ #include "BKE_text.h" #include "ED_screen.h" -#include "ED_types.h" -#include "ED_util.h" -#include "WM_api.h" #include "WM_types.h" #include "BIF_gl.h" #include "BIF_glutil.h" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" -#include "RNA_access.h" #ifndef DISABLE_PYTHON #include "BPY_extern.h" diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index 738dfb00e56..4554b6eaabe 100644 --- a/source/blender/editors/space_text/text_ops.c +++ b/source/blender/editors/space_text/text_ops.c @@ -35,13 +35,7 @@ #include "MEM_guardedalloc.h" #include "DNA_constraint_types.h" -#include "DNA_object_types.h" -#include "DNA_action_types.h" -#include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" #include "DNA_text_types.h" -#include "DNA_windowmanager_types.h" #include "BLI_blenlib.h" #include "PIL_time.h" diff --git a/source/blender/editors/space_text/text_python.c b/source/blender/editors/space_text/text_python.c index c5d56408b1e..aee1a7ecfd6 100644 --- a/source/blender/editors/space_text/text_python.c +++ b/source/blender/editors/space_text/text_python.c @@ -39,7 +39,6 @@ #include "BLI_blenlib.h" -#include "WM_api.h" #include "WM_types.h" #include "text_intern.h" diff --git a/source/blender/editors/space_time/space_time.c b/source/blender/editors/space_time/space_time.c index 0dc4bff0ebf..31b76e6d5fa 100644 --- a/source/blender/editors/space_time/space_time.c +++ b/source/blender/editors/space_time/space_time.c @@ -30,10 +30,7 @@ #include <stdio.h> #include "DNA_object_types.h" -#include "DNA_space_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_windowmanager_types.h" #include "MEM_guardedalloc.h" @@ -47,9 +44,7 @@ #include "ED_anim_api.h" #include "ED_keyframes_draw.h" -#include "ED_space_api.h" #include "ED_screen.h" -#include "ED_util.h" #include "WM_api.h" #include "WM_types.h" @@ -57,7 +52,6 @@ #include "BIF_gl.h" #include "BIF_glutil.h" -#include "UI_interface.h" #include "UI_resources.h" #include "UI_view2d.h" diff --git a/source/blender/editors/space_time/time_ops.c b/source/blender/editors/space_time/time_ops.c index 9b391db0086..68036d0ea33 100644 --- a/source/blender/editors/space_time/time_ops.c +++ b/source/blender/editors/space_time/time_ops.c @@ -32,22 +32,15 @@ #include "MEM_guardedalloc.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_space_types.h" -#include "DNA_windowmanager_types.h" #include "BLI_blenlib.h" #include "BKE_context.h" #include "BKE_utildefines.h" -#include "UI_interface.h" -#include "UI_view2d.h" #include "ED_screen.h" -#include "RNA_access.h" -#include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_userpref/space_userpref.c b/source/blender/editors/space_userpref/space_userpref.c index d1a8c4e9ff9..4d6d303625b 100644 --- a/source/blender/editors/space_userpref/space_userpref.c +++ b/source/blender/editors/space_userpref/space_userpref.c @@ -29,8 +29,6 @@ #include <string.h> #include <stdio.h> -#include "DNA_space_types.h" -#include "DNA_screen_types.h" #include "MEM_guardedalloc.h" @@ -39,7 +37,6 @@ #include "BKE_context.h" #include "BKE_screen.h" -#include "ED_space_api.h" #include "ED_screen.h" #include "BIF_gl.h" diff --git a/source/blender/editors/space_view3d/drawanimviz.c b/source/blender/editors/space_view3d/drawanimviz.c index 721ab12dbc1..8db1ddb7505 100644 --- a/source/blender/editors/space_view3d/drawanimviz.c +++ b/source/blender/editors/space_view3d/drawanimviz.c @@ -38,16 +38,10 @@ #include "MEM_guardedalloc.h" #include "DNA_anim_types.h" -#include "DNA_action_types.h" #include "DNA_armature_types.h" -#include "DNA_constraint_types.h" -#include "DNA_ID.h" -#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" -#include "DNA_space_types.h" #include "DNA_view3d_types.h" -#include "DNA_userdef_types.h" #include "BLI_blenlib.h" #include "BLI_math.h" @@ -72,11 +66,8 @@ #include "BIF_glutil.h" #include "ED_armature.h" -#include "ED_anim_api.h" #include "ED_keyframes_draw.h" -#include "WM_api.h" -#include "WM_types.h" #include "BLF_api.h" #include "UI_resources.h" diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c index 13f13ffca01..1073d260189 100644 --- a/source/blender/editors/space_view3d/drawarmature.c +++ b/source/blender/editors/space_view3d/drawarmature.c @@ -38,17 +38,11 @@ #include "MEM_guardedalloc.h" #include "DNA_anim_types.h" -#include "DNA_action_types.h" #include "DNA_armature_types.h" #include "DNA_constraint_types.h" -#include "DNA_ID.h" -#include "DNA_nla_types.h" -#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" -#include "DNA_space_types.h" #include "DNA_view3d_types.h" -#include "DNA_userdef_types.h" #include "BLI_blenlib.h" #include "BLI_math.h" @@ -74,8 +68,6 @@ #include "ED_armature.h" #include "ED_keyframes_draw.h" -#include "WM_api.h" -#include "WM_types.h" #include "BLF_api.h" #include "UI_resources.h" diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index 57ab9191bee..ced745bb5d4 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -35,20 +35,13 @@ #include "BLI_edgehash.h" #include "BLI_editVert.h" -#include "IMB_imbuf.h" -#include "IMB_imbuf_types.h" -#include "DNA_image_types.h" -#include "DNA_lamp_types.h" #include "DNA_material_types.h" -#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_object_types.h" #include "DNA_property_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_view3d_types.h" -#include "DNA_userdef_types.h" #include "BKE_bmfont.h" #include "BKE_displist.h" @@ -68,7 +61,6 @@ #include "BIF_glutil.h" #include "UI_resources.h" -#include "UI_interface_icons.h" #include "gpu_buffers.h" #include "GPU_extensions.h" diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index fa304c3ea8b..128d5050455 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -34,34 +34,20 @@ #include "MEM_guardedalloc.h" -#include "IMB_imbuf.h" -#include "DNA_armature_types.h" -#include "DNA_boid_types.h" #include "DNA_camera_types.h" #include "DNA_curve_types.h" #include "DNA_constraint_types.h" // for drawing constraint -#include "DNA_effect_types.h" #include "DNA_lamp_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_modifier_types.h" -#include "DNA_object_types.h" -#include "DNA_object_force.h" -#include "DNA_object_fluidsim.h" -#include "DNA_particle_types.h" -#include "DNA_space_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" #include "DNA_smoke_types.h" -#include "DNA_userdef_types.h" -#include "DNA_view3d_types.h" #include "DNA_world_types.h" #include "BLI_blenlib.h" @@ -101,7 +87,6 @@ #include "BIF_glutil.h" #include "GPU_draw.h" -#include "GPU_material.h" #include "GPU_extensions.h" #include "ED_mesh.h" @@ -109,10 +94,8 @@ #include "ED_screen.h" #include "ED_sculpt.h" #include "ED_types.h" -#include "ED_util.h" #include "UI_resources.h" -#include "UI_interface_icons.h" #include "WM_api.h" #include "wm_subwindow.h" diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c index 004d4a022f6..b091c4281c9 100644 --- a/source/blender/editors/space_view3d/drawvolume.c +++ b/source/blender/editors/space_view3d/drawvolume.c @@ -35,35 +35,13 @@ #include "MEM_guardedalloc.h" -#include "IMB_imbuf.h" - - - - -#include "DNA_armature_types.h" -#include "DNA_boid_types.h" -#include "DNA_camera_types.h" -#include "DNA_curve_types.h" -#include "DNA_constraint_types.h" // for drawing constraint -#include "DNA_effect_types.h" -#include "DNA_lamp_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_modifier_types.h" -#include "DNA_object_types.h" -#include "DNA_object_force.h" -#include "DNA_object_fluidsim.h" -#include "DNA_particle_types.h" -#include "DNA_space_types.h" + + + + #include "DNA_scene_types.h" #include "DNA_screen_types.h" -#include "DNA_smoke_types.h" -#include "DNA_userdef_types.h" #include "DNA_view3d_types.h" -#include "DNA_world_types.h" #include "BLI_blenlib.h" #include "BLI_math.h" @@ -99,23 +77,13 @@ #include "BIF_gl.h" #include "BIF_glutil.h" -#include "GPU_draw.h" -#include "GPU_material.h" #include "GPU_extensions.h" #include "ED_mesh.h" -#include "ED_particle.h" -#include "ED_screen.h" -#include "ED_types.h" -#include "ED_util.h" -#include "UI_resources.h" -#include "UI_interface_icons.h" -#include "WM_api.h" #include "BLF_api.h" -#include "GPU_extensions.h" #include "view3d_intern.h" // own include diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index bcfc0071237..869d0c45f2f 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -29,13 +29,8 @@ #include <string.h> #include <stdio.h> -#include "DNA_action_types.h" -#include "DNA_armature_types.h" #include "DNA_object_types.h" -#include "DNA_space_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_view3d_types.h" #include "MEM_guardedalloc.h" @@ -50,21 +45,15 @@ #include "BKE_utildefines.h" #include "BKE_image.h" -#include "ED_armature.h" -#include "ED_space_api.h" #include "ED_screen.h" #include "ED_object.h" #include "BIF_gl.h" -#include "GPU_draw.h" #include "WM_api.h" #include "WM_types.h" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" #include "RNA_access.h" diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index 82ed635cc0d..56c5efb8b41 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -31,24 +31,13 @@ #include <math.h> #include <float.h> -#include "DNA_ID.h" -#include "DNA_action_types.h" #include "DNA_armature_types.h" #include "DNA_curve_types.h" -#include "DNA_camera_types.h" -#include "DNA_gpencil_types.h" -#include "DNA_lamp_types.h" #include "DNA_lattice_types.h" #include "DNA_meta_types.h" -#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "DNA_space_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_userdef_types.h" -#include "DNA_view3d_types.h" -#include "DNA_world_types.h" #include "MEM_guardedalloc.h" @@ -78,24 +67,15 @@ #include "WM_types.h" #include "RNA_access.h" -#include "RNA_define.h" #include "ED_armature.h" -#include "ED_curve.h" -#include "ED_image.h" #include "ED_gpencil.h" -#include "ED_keyframing.h" #include "ED_mesh.h" -#include "ED_object.h" -#include "ED_particle.h" #include "ED_screen.h" #include "ED_transform.h" -#include "ED_types.h" -#include "ED_util.h" #include "UI_interface.h" #include "UI_resources.h" -#include "UI_view2d.h" #include "view3d_intern.h" // own include diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 5a507556e1b..c75e068648f 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -30,19 +30,13 @@ #include <stdio.h> #include <math.h> -#include "DNA_action_types.h" #include "DNA_armature_types.h" #include "DNA_camera_types.h" #include "DNA_customdata_types.h" #include "DNA_group_types.h" #include "DNA_key_types.h" #include "DNA_lamp_types.h" -#include "DNA_object_types.h" -#include "DNA_space_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_userdef_types.h" -#include "DNA_view3d_types.h" #include "DNA_world_types.h" #include "MEM_guardedalloc.h" @@ -74,24 +68,19 @@ #include "BIF_glutil.h" #include "WM_api.h" -#include "WM_types.h" #include "BLF_api.h" #include "ED_armature.h" #include "ED_keyframing.h" #include "ED_gpencil.h" -#include "ED_mesh.h" #include "ED_screen.h" #include "ED_space_api.h" #include "ED_screen_types.h" -#include "ED_util.h" #include "ED_transform.h" -#include "ED_types.h" #include "UI_interface.h" #include "UI_interface_icons.h" #include "UI_resources.h" -#include "UI_view2d.h" #include "GPU_draw.h" #include "GPU_material.h" diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 16c754ddc2d..45675d44d31 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -31,17 +31,9 @@ #include <math.h> #include <float.h> -#include "DNA_action_types.h" #include "DNA_armature_types.h" -#include "DNA_camera_types.h" -#include "DNA_lamp_types.h" #include "DNA_object_types.h" -#include "DNA_space_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_userdef_types.h" -#include "DNA_view3d_types.h" -#include "DNA_world_types.h" #include "MEM_guardedalloc.h" @@ -60,7 +52,6 @@ #include "BKE_screen.h" #include "BKE_utildefines.h" -#include "RE_pipeline.h" // make_stars #include "BIF_gl.h" @@ -72,15 +63,10 @@ #include "ED_particle.h" #include "ED_retopo.h" -#include "ED_space_api.h" #include "ED_screen.h" #include "ED_transform.h" -#include "ED_types.h" #include "ED_mesh.h" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" #include "PIL_time.h" /* smoothview */ diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index fad86ac12e8..76e076b05bd 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -30,19 +30,7 @@ #include <stdio.h> #include <stdlib.h> -#include "DNA_armature_types.h" -#include "DNA_ID.h" -#include "DNA_image_types.h" -#include "DNA_meshdata_types.h" -#include "DNA_mesh_types.h" -#include "DNA_object_types.h" -#include "DNA_space_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_texture_types.h" -#include "DNA_userdef_types.h" /* U.smooth_viewtx */ -#include "DNA_view3d_types.h" -#include "DNA_windowmanager_types.h" #include "RNA_access.h" @@ -66,9 +54,6 @@ #include "BKE_screen.h" #include "BKE_utildefines.h" /* for VECCOPY */ -#include "ED_armature.h" -#include "ED_particle.h" -#include "ED_object.h" #include "ED_mesh.h" #include "ED_util.h" #include "ED_screen.h" @@ -78,7 +63,6 @@ #include "WM_api.h" #include "WM_types.h" -#include "RNA_access.h" #include "RNA_define.h" #include "RNA_enum_types.h" @@ -90,9 +74,7 @@ #include "BLI_editVert.h" #include "UI_interface.h" -#include "UI_interface_icons.h" #include "UI_resources.h" -#include "UI_view2d.h" #include "view3d_intern.h" diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c index a5d18e30023..ccc2717556d 100644 --- a/source/blender/editors/space_view3d/view3d_ops.c +++ b/source/blender/editors/space_view3d/view3d_ops.c @@ -35,9 +35,7 @@ #include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "DNA_userdef_types.h" #include "DNA_view3d_types.h" -#include "DNA_windowmanager_types.h" #include "BLI_math.h" #include "BLI_blenlib.h" @@ -47,12 +45,10 @@ #include "BKE_utildefines.h" #include "RNA_access.h" -#include "RNA_define.h" #include "WM_api.h" #include "WM_types.h" -#include "ED_screen.h" #include "ED_transform.h" #include "view3d_intern.h" diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index b473ae33aa4..851ed793d3c 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -31,21 +31,12 @@ #include <math.h> #include <float.h> -#include "DNA_action_types.h" #include "DNA_armature_types.h" #include "DNA_curve_types.h" -#include "DNA_camera_types.h" -#include "DNA_lamp_types.h" #include "DNA_meta_types.h" -#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "DNA_space_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_userdef_types.h" -#include "DNA_view3d_types.h" -#include "DNA_world_types.h" #include "MEM_guardedalloc.h" @@ -65,7 +56,6 @@ #include "BKE_screen.h" #include "BKE_utildefines.h" -#include "RE_pipeline.h" // make_stars #include "BIF_gl.h" @@ -82,15 +72,10 @@ #include "ED_object.h" #include "ED_retopo.h" #include "ED_screen.h" -#include "ED_types.h" -#include "ED_util.h" #include "ED_mball.h" #include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" -#include "PIL_time.h" /* smoothview */ #include "view3d_intern.h" // own include diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index bd02a34cbd8..48658b57297 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -32,20 +32,11 @@ #include "MEM_guardedalloc.h" -#include "DNA_action_types.h" #include "DNA_armature_types.h" #include "DNA_curve_types.h" -#include "DNA_group_types.h" -#include "DNA_ipo_types.h" #include "DNA_lattice_types.h" #include "DNA_meta_types.h" -#include "DNA_mesh_types.h" -#include "DNA_modifier_types.h" -#include "DNA_object_types.h" -#include "DNA_screen_types.h" #include "DNA_scene_types.h" -#include "DNA_space_types.h" -#include "DNA_view3d_types.h" #include "BLI_blenlib.h" #include "BLI_math.h" @@ -70,16 +61,11 @@ #include "WM_api.h" #include "WM_types.h" -#include "RNA_access.h" -#include "RNA_define.h" -#include "UI_interface.h" -#include "ED_anim_api.h" #include "ED_armature.h" #include "ED_mesh.h" #include "ED_screen.h" -#include "ED_view3d.h" #include "view3d_intern.h" diff --git a/source/blender/editors/space_view3d/view3d_toolbar.c b/source/blender/editors/space_view3d/view3d_toolbar.c index 11e5975cabb..c9aacf0e958 100644 --- a/source/blender/editors/space_view3d/view3d_toolbar.c +++ b/source/blender/editors/space_view3d/view3d_toolbar.c @@ -31,23 +31,8 @@ #include <math.h> #include <float.h> -#include "DNA_ID.h" -#include "DNA_action_types.h" -#include "DNA_armature_types.h" -#include "DNA_curve_types.h" -#include "DNA_camera_types.h" -#include "DNA_lamp_types.h" -#include "DNA_lattice_types.h" -#include "DNA_meta_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "DNA_space_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_userdef_types.h" -#include "DNA_view3d_types.h" -#include "DNA_world_types.h" #include "MEM_guardedalloc.h" @@ -76,23 +61,12 @@ #include "WM_types.h" #include "RNA_access.h" -#include "RNA_define.h" - -#include "ED_armature.h" -#include "ED_curve.h" -#include "ED_image.h" -#include "ED_keyframing.h" -#include "ED_mesh.h" -#include "ED_object.h" -#include "ED_particle.h" + #include "ED_screen.h" -#include "ED_transform.h" -#include "ED_types.h" #include "ED_util.h" #include "UI_interface.h" #include "UI_resources.h" -#include "UI_view2d.h" #include "view3d_intern.h" // own include diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index c03ea0e36c1..b25a6499462 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -32,17 +32,9 @@ #include <float.h> #include "DNA_anim_types.h" -#include "DNA_action_types.h" -#include "DNA_armature_types.h" #include "DNA_camera_types.h" #include "DNA_lamp_types.h" -#include "DNA_object_types.h" -#include "DNA_space_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_userdef_types.h" -#include "DNA_view3d_types.h" -#include "DNA_world_types.h" #include "MEM_guardedalloc.h" @@ -63,7 +55,6 @@ #include "BKE_utildefines.h" #include "BKE_depsgraph.h" /* for fly mode updating */ -#include "RE_pipeline.h" // make_stars #include "BIF_gl.h" #include "BIF_glutil.h" @@ -72,16 +63,10 @@ #include "WM_types.h" #include "ED_keyframing.h" -#include "ED_mesh.h" #include "ED_screen.h" -#include "ED_view3d.h" #include "ED_armature.h" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" -#include "GPU_draw.h" #include "PIL_time.h" /* smoothview */ diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 414e789787a..36ccb509653 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -47,20 +47,9 @@ #include "DNA_anim_types.h" #include "DNA_armature_types.h" -#include "DNA_action_types.h" /* for some special action-editor settings */ #include "DNA_constraint_types.h" -#include "DNA_ipo_types.h" /* some silly ipo flag */ -#include "DNA_listBase.h" #include "DNA_meshdata_types.h" -#include "DNA_mesh_types.h" -#include "DNA_object_types.h" #include "DNA_scene_types.h" /* PET modes */ -#include "DNA_screen_types.h" /* area dimensions */ -#include "DNA_texture_types.h" -#include "DNA_userdef_types.h" -#include "DNA_view3d_types.h" -#include "DNA_space_types.h" -#include "DNA_windowmanager_types.h" #include "RNA_access.h" @@ -98,7 +87,6 @@ #include "ED_screen.h" #include "ED_space_api.h" #include "ED_markers.h" -#include "ED_util.h" #include "ED_view3d.h" #include "ED_mesh.h" @@ -112,7 +100,6 @@ #include "BLI_ghash.h" #include "BLI_linklist.h" -#include "PIL_time.h" /* sleep */ #include "UI_resources.h" diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c index b9e047c95e8..14d0676786e 100644 --- a/source/blender/editors/transform/transform_constraints.c +++ b/source/blender/editors/transform/transform_constraints.c @@ -44,19 +44,6 @@ #include "MEM_guardedalloc.h" -#include "DNA_action_types.h" -#include "DNA_armature_types.h" -#include "DNA_camera_types.h" -#include "DNA_curve_types.h" -#include "DNA_effect_types.h" -#include "DNA_image_types.h" -#include "DNA_ipo_types.h" -#include "DNA_key_types.h" -#include "DNA_lamp_types.h" -#include "DNA_lattice_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" -#include "DNA_meta_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" @@ -79,7 +66,6 @@ // //#include "mydevice.h" -#include "WM_types.h" #include "UI_resources.h" diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 2aca6329717..02e4ee5da91 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -38,37 +38,15 @@ #include "MEM_guardedalloc.h" #include "DNA_anim_types.h" -#include "DNA_action_types.h" #include "DNA_armature_types.h" -#include "DNA_camera_types.h" -#include "DNA_curve_types.h" -#include "DNA_effect_types.h" -#include "DNA_image_types.h" -#include "DNA_key_types.h" -#include "DNA_lamp_types.h" #include "DNA_lattice_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_meta_types.h" -#include "DNA_modifier_types.h" -#include "DNA_nla_types.h" #include "DNA_node_types.h" -#include "DNA_object_types.h" -#include "DNA_object_force.h" -#include "DNA_particle_types.h" -#include "DNA_scene_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" #include "DNA_sequence_types.h" -#include "DNA_texture_types.h" #include "DNA_view3d_types.h" -#include "DNA_world_types.h" -#include "DNA_userdef_types.h" -#include "DNA_property_types.h" -#include "DNA_vfont_types.h" #include "DNA_constraint_types.h" -#include "DNA_listBase.h" -#include "DNA_gpencil_types.h" #include "BKE_action.h" #include "BKE_armature.h" @@ -115,7 +93,6 @@ #include "ED_mesh.h" #include "ED_types.h" #include "ED_uvedit.h" -#include "ED_view3d.h" #include "UI_view2d.h" diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 8d7c5c820d0..5dbd2a833a6 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -35,24 +35,11 @@ #include "BLO_sys_types.h" // for intptr_t support #include "DNA_anim_types.h" -#include "DNA_action_types.h" #include "DNA_armature_types.h" -#include "DNA_constraint_types.h" -#include "DNA_curve_types.h" #include "DNA_lattice_types.h" -#include "DNA_mesh_types.h" -#include "DNA_modifier_types.h" -#include "DNA_nla_types.h" -#include "DNA_node_types.h" -#include "DNA_object_types.h" -#include "DNA_object_force.h" -#include "DNA_particle_types.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "DNA_scene_types.h" -#include "DNA_userdef_types.h" #include "DNA_view3d_types.h" -#include "DNA_windowmanager_types.h" #include "RNA_access.h" @@ -105,7 +92,6 @@ #include "BLI_editVert.h" #include "BLI_rand.h" -#include "RNA_access.h" #include "WM_types.h" #include "WM_api.h" diff --git a/source/blender/editors/transform/transform_input.c b/source/blender/editors/transform/transform_input.c index e3386f1b1e7..d7ebd28f604 100644 --- a/source/blender/editors/transform/transform_input.c +++ b/source/blender/editors/transform/transform_input.c @@ -26,7 +26,6 @@ #include <math.h> #include "DNA_screen_types.h" -#include "DNA_windowmanager_types.h" #include "BLI_math.h" diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index 754ad8ad9a3..5e7c6fc9d3d 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -41,17 +41,11 @@ #include "MEM_guardedalloc.h" #include "DNA_armature_types.h" -#include "DNA_action_types.h" #include "DNA_curve_types.h" #include "DNA_lattice_types.h" -#include "DNA_mesh_types.h" #include "DNA_meta_types.h" -#include "DNA_object_types.h" -#include "DNA_particle_types.h" #include "DNA_screen_types.h" #include "DNA_scene_types.h" -#include "DNA_space_types.h" -#include "DNA_userdef_types.h" #include "DNA_view3d_types.h" #include "RNA_access.h" @@ -78,8 +72,6 @@ #include "ED_armature.h" #include "ED_mesh.h" #include "ED_particle.h" -#include "ED_space_api.h" -#include "ED_transform.h" #include "ED_view3d.h" #include "UI_resources.h" diff --git a/source/blender/editors/transform/transform_ndofinput.c b/source/blender/editors/transform/transform_ndofinput.c index 2796518dbc6..3e47484c54c 100644 --- a/source/blender/editors/transform/transform_ndofinput.c +++ b/source/blender/editors/transform/transform_ndofinput.c @@ -30,8 +30,6 @@ #include "BKE_global.h" /* for G */ #include "BKE_utildefines.h" /* ABS */ -#include "DNA_view3d_types.h" /* for G.vd (view3d) */ -#include "DNA_windowmanager_types.h" /* for G.vd (view3d) */ #include "WM_types.h" diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c index fd1d50c551a..b12de7fd6f8 100644 --- a/source/blender/editors/transform/transform_ops.c +++ b/source/blender/editors/transform/transform_ops.c @@ -25,8 +25,6 @@ #include "MEM_guardedalloc.h" #include "DNA_scene_types.h" -#include "DNA_space_types.h" -#include "DNA_windowmanager_types.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index a8a469ccd98..d509ce97015 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -28,16 +28,10 @@ #include "MEM_guardedalloc.h" #include "DNA_armature_types.h" -#include "DNA_action_types.h" #include "DNA_curve_types.h" -#include "DNA_listBase.h" #include "DNA_object_types.h" -#include "DNA_meshdata_types.h" -#include "DNA_mesh_types.h" -#include "DNA_meta_types.h" #include "DNA_scene_types.h" #include "DNA_screen_types.h" -#include "DNA_space_types.h" #include "DNA_view3d_types.h" #include "BKE_global.h" @@ -57,9 +51,7 @@ #include "ED_armature.h" #include "ED_mesh.h" -#include "ED_util.h" -#include "UI_interface.h" #include "RNA_define.h" diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 71952579b32..e7e2ba6ce76 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -34,14 +34,11 @@ #include "PIL_time.h" -#include "DNA_action_types.h" #include "DNA_armature_types.h" -#include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_meshdata_types.h" // Temporary, for snapping to other unselected meshes #include "DNA_space_types.h" #include "DNA_screen_types.h" -#include "DNA_userdef_types.h" #include "DNA_view3d_types.h" #include "DNA_windowmanager_types.h" @@ -73,7 +70,6 @@ #include "ED_armature.h" #include "ED_image.h" #include "ED_mesh.h" -#include "ED_transform.h" #include "ED_uvedit.h" #include "ED_view3d.h" diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c index ff982e9d133..52e3b9baa13 100644 --- a/source/blender/editors/util/ed_util.c +++ b/source/blender/editors/util/ed_util.c @@ -31,11 +31,8 @@ #include "MEM_guardedalloc.h" -#include "DNA_curve_types.h" -#include "DNA_mesh_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_userdef_types.h" #include "BLI_blenlib.h" #include "BLI_editVert.h" diff --git a/source/blender/editors/util/editmode_undo.c b/source/blender/editors/util/editmode_undo.c index 60f8385a5db..8597454fdb5 100644 --- a/source/blender/editors/util/editmode_undo.c +++ b/source/blender/editors/util/editmode_undo.c @@ -34,12 +34,8 @@ #include "MEM_guardedalloc.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_screen_types.h" -#include "DNA_scene_types.h" -#include "DNA_userdef_types.h" #include "BKE_context.h" #include "BKE_depsgraph.h" @@ -51,7 +47,6 @@ #include "BKE_utildefines.h" -#include "ED_util.h" #include "ED_mesh.h" #include "UI_interface.h" diff --git a/source/blender/editors/util/numinput.c b/source/blender/editors/util/numinput.c index 5f89dd42dbb..a5c0bfeb73a 100644 --- a/source/blender/editors/util/numinput.c +++ b/source/blender/editors/util/numinput.c @@ -34,7 +34,6 @@ #include "BKE_utildefines.h" /* ABS */ #include "WM_types.h" -#include "DNA_windowmanager_types.h" #include "ED_numinput.h" diff --git a/source/blender/editors/util/undo.c b/source/blender/editors/util/undo.c index 1bb6cde180e..636ce9dcec5 100644 --- a/source/blender/editors/util/undo.c +++ b/source/blender/editors/util/undo.c @@ -34,13 +34,7 @@ #include "MEM_guardedalloc.h" -#include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "DNA_screen_types.h" -#include "DNA_scene_types.h" -#include "DNA_space_types.h" -#include "DNA_userdef_types.h" #include "BKE_blender.h" #include "BKE_context.h" @@ -69,8 +63,6 @@ #include "WM_api.h" #include "WM_types.h" -#include "UI_interface.h" -#include "UI_resources.h" #include "util_intern.h" diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c index 62f188dd19d..ce59c8e37b4 100644 --- a/source/blender/editors/uvedit/uvedit_draw.c +++ b/source/blender/editors/uvedit/uvedit_draw.c @@ -29,7 +29,6 @@ #include <math.h> #include <stdlib.h> -#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 4ddb03f859a..fe0478a2a15 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -34,12 +34,8 @@ #include "MEM_guardedalloc.h" #include "DNA_object_types.h" -#include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "DNA_space_types.h" #include "DNA_scene_types.h" -#include "DNA_screen_types.h" -#include "DNA_windowmanager_types.h" #include "BLI_math.h" #include "BLI_blenlib.h" @@ -62,7 +58,6 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "RNA_types.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c index bc5a0150b2d..c2682325c39 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c @@ -34,12 +34,9 @@ #include "MEM_guardedalloc.h" #include "DNA_camera_types.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 "BKE_context.h" #include "BKE_customdata.h" @@ -64,7 +61,6 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "UI_interface.h" #include "WM_api.h" #include "WM_types.h" |