diff options
Diffstat (limited to 'source/blender/editors')
88 files changed, 24 insertions, 140 deletions
diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c index d46c18a553d..02e141a7a69 100644 --- a/source/blender/editors/animation/keyframes_draw.c +++ b/source/blender/editors/animation/keyframes_draw.c @@ -61,7 +61,6 @@ #include "BKE_utildefines.h" #include "BIF_gl.h" -#include "BIF_glutil.h" #include "UI_resources.h" #include "UI_view2d.h" diff --git a/source/blender/editors/armature/armature_ops.c b/source/blender/editors/armature/armature_ops.c index d50b50cb107..d5bd09cc8f1 100644 --- a/source/blender/editors/armature/armature_ops.c +++ b/source/blender/editors/armature/armature_ops.c @@ -29,7 +29,6 @@ #include <stdlib.h> #include <math.h> -#include "MEM_guardedalloc.h" #include "BLI_math.h" diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index 525ca9aae1c..0b5f99152de 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -31,7 +31,6 @@ #include <math.h> #include <float.h> -#include "MEM_guardedalloc.h" #include "DNA_anim_types.h" #include "DNA_armature_types.h" @@ -39,6 +38,8 @@ #include "DNA_meshdata_types.h" #include "DNA_scene_types.h" +#include "MEM_guardedalloc.h" + #include "BLI_blenlib.h" #include "BLI_math.h" #include "BLI_editVert.h" @@ -62,7 +63,6 @@ #include "DNA_object_types.h" #include "BIF_gl.h" -#include "BIF_generate.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/armature/editarmature_generate.c b/source/blender/editors/armature/editarmature_generate.c index 8c53a03fd2b..1c9024f6f91 100644 --- a/source/blender/editors/armature/editarmature_generate.c +++ b/source/blender/editors/armature/editarmature_generate.c @@ -32,7 +32,6 @@ #include <math.h> #include <float.h> -#include "MEM_guardedalloc.h" #include "DNA_scene_types.h" #include "DNA_armature_types.h" diff --git a/source/blender/editors/armature/poseSlide.c b/source/blender/editors/armature/poseSlide.c index 54777535146..8d8f1bf24ee 100644 --- a/source/blender/editors/armature/poseSlide.c +++ b/source/blender/editors/armature/poseSlide.c @@ -56,7 +56,6 @@ #include "WM_types.h" -#include "BIF_gl.h" #include "ED_armature.h" #include "ED_keyframes_draw.h" diff --git a/source/blender/editors/armature/poseUtils.c b/source/blender/editors/armature/poseUtils.c index efacc6571cf..b8b9c354d9a 100644 --- a/source/blender/editors/armature/poseUtils.c +++ b/source/blender/editors/armature/poseUtils.c @@ -56,7 +56,6 @@ #include "WM_types.h" -#include "BIF_gl.h" #include "ED_armature.h" #include "ED_keyframing.h" diff --git a/source/blender/editors/armature/poseobject.c b/source/blender/editors/armature/poseobject.c index 7e17b6d0674..525a8be53e6 100644 --- a/source/blender/editors/armature/poseobject.c +++ b/source/blender/editors/armature/poseobject.c @@ -54,7 +54,6 @@ #include "BKE_modifier.h" #include "BKE_report.h" -#include "BIF_gl.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/armature/reeb.c b/source/blender/editors/armature/reeb.c index 9af07d36ac0..9602d80575a 100644 --- a/source/blender/editors/armature/reeb.c +++ b/source/blender/editors/armature/reeb.c @@ -31,14 +31,13 @@ #include <stdlib.h> // for qsort #include <float.h> - #include "DNA_scene_types.h" #include "DNA_object_types.h" -#include "BKE_context.h" - #include "MEM_guardedalloc.h" +#include "BKE_context.h" + #include "BLI_blenlib.h" #include "BLI_math.h" #include "BLI_editVert.h" @@ -51,7 +50,6 @@ //#include "BIF_interface.h" //#include "BIF_toolbox.h" //#include "BIF_graphics.h" -#include "BIF_gl.h" //#include "blendef.h" diff --git a/source/blender/editors/curve/curve_ops.c b/source/blender/editors/curve/curve_ops.c index 85c3cc91679..b5b6ee4e6da 100644 --- a/source/blender/editors/curve/curve_ops.c +++ b/source/blender/editors/curve/curve_ops.c @@ -29,7 +29,6 @@ #include <stdlib.h> #include <math.h> -#include "MEM_guardedalloc.h" #include "DNA_curve_types.h" diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index b85429e36a9..f88d89c97ac 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -36,6 +36,11 @@ #include <io.h> #endif #include <stdlib.h> + +#include "DNA_key_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" + #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" @@ -44,10 +49,6 @@ #include "BLI_rand.h" #include "BLI_ghash.h" -#include "DNA_key_types.h" -#include "DNA_object_types.h" -#include "DNA_scene_types.h" - #include "BKE_context.h" #include "BKE_curve.h" #include "BKE_depsgraph.h" diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c index 5e0e09231eb..284dac7a0ae 100644 --- a/source/blender/editors/gpencil/drawgpencil.c +++ b/source/blender/editors/gpencil/drawgpencil.c @@ -32,7 +32,6 @@ #include <math.h> #include <float.h> -#include "MEM_guardedalloc.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/editors/gpencil/editaction_gpencil.c b/source/blender/editors/gpencil/editaction_gpencil.c index 9073cb01d5f..d76e5fcf17c 100644 --- a/source/blender/editors/gpencil/editaction_gpencil.c +++ b/source/blender/editors/gpencil/editaction_gpencil.c @@ -31,18 +31,9 @@ #include <stddef.h> #include <math.h> -#include "MEM_guardedalloc.h" - #include "BLI_math.h" #include "BLI_blenlib.h" - - -#include "BIF_gl.h" -#include "BIF_glutil.h" - - - #include "gpencil_intern.h" #if 0 // XXX disabled until grease pencil code stabilises again diff --git a/source/blender/editors/gpencil/gpencil_buttons.c b/source/blender/editors/gpencil/gpencil_buttons.c index 00a6d0fb94d..c50e176aee6 100644 --- a/source/blender/editors/gpencil/gpencil_buttons.c +++ b/source/blender/editors/gpencil/gpencil_buttons.c @@ -30,7 +30,6 @@ #include <stdlib.h> #include <stddef.h> -#include "MEM_guardedalloc.h" #include "BLI_math.h" #include "BLI_blenlib.h" @@ -47,8 +46,6 @@ #include "RNA_access.h" -#include "BIF_gl.h" -#include "BIF_glutil.h" #include "ED_gpencil.h" diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index d41b581e9e0..e0d257ca3bf 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -54,8 +54,6 @@ #include "BKE_object.h" #include "BKE_report.h" -#include "BIF_gl.h" -#include "BIF_glutil.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 5d4621b426d..4c86b9480d4 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -45,7 +45,6 @@ #include "BKE_unit.h" #include "BIF_gl.h" -#include "BIF_glutil.h" #include "BLF_api.h" diff --git a/source/blender/editors/interface/interface_anim.c b/source/blender/editors/interface/interface_anim.c index dd690ba75d7..c99622c7518 100644 --- a/source/blender/editors/interface/interface_anim.c +++ b/source/blender/editors/interface/interface_anim.c @@ -3,7 +3,6 @@ #include <stdlib.h> #include <string.h> -#include "MEM_guardedalloc.h" #include "DNA_anim_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index e72bbaede4d..3ba7c654210 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -60,7 +60,6 @@ #include "IMB_imbuf_types.h" #include "BIF_gl.h" -#include "BIF_glutil.h" #include "ED_datafiles.h" #include "ED_render.h" diff --git a/source/blender/editors/interface/interface_style.c b/source/blender/editors/interface/interface_style.c index 360360127a0..03676ae5e06 100644 --- a/source/blender/editors/interface/interface_style.c +++ b/source/blender/editors/interface/interface_style.c @@ -40,8 +40,6 @@ #include "BKE_global.h" -#include "BIF_gl.h" -#include "BIF_glutil.h" #include "BLF_api.h" diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index e4bf6af1564..6b7d88d3c28 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -28,7 +28,6 @@ #include <stdlib.h> #include <string.h> -#include "MEM_guardedalloc.h" #include "DNA_screen_types.h" #include "DNA_userdef_types.h" diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index 9a88a52d4b4..14ec7c6d0d6 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -44,7 +44,6 @@ #include "WM_api.h" #include "BIF_gl.h" -#include "BIF_glutil.h" #include "BLF_api.h" diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index 8611f6dd4ea..de1b26e987b 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -41,7 +41,6 @@ #include "WM_api.h" #include "WM_types.h" -#include "BIF_gl.h" #include "ED_screen.h" diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c index a2db1929989..fc92598591a 100644 --- a/source/blender/editors/mesh/editface.c +++ b/source/blender/editors/mesh/editface.c @@ -50,7 +50,6 @@ #include "BKE_context.h" #include "BIF_gl.h" -#include "BIF_glutil.h" #ifndef DISABLE_PYTHON diff --git a/source/blender/editors/mesh/editmesh_mods.c b/source/blender/editors/mesh/editmesh_mods.c index 4af3aab569f..0274bf1004d 100644 --- a/source/blender/editors/mesh/editmesh_mods.c +++ b/source/blender/editors/mesh/editmesh_mods.c @@ -77,7 +77,6 @@ editmesh_mods.c, UI level access, no geometry changes #include "ED_view3d.h" #include "BIF_gl.h" -#include "BIF_glutil.h" #include "mesh_intern.h" diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 54794215559..799ef580f63 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -37,8 +37,6 @@ editmesh_tool.c: UI called tools for editmesh, geometry changes here, otherwise #include <math.h> #include <float.h> -#include "MEM_guardedalloc.h" - #include "BLO_sys_types.h" // for intptr_t support #include "DNA_meshdata_types.h" @@ -47,6 +45,8 @@ editmesh_tool.c: UI called tools for editmesh, geometry changes here, otherwise #include "DNA_scene_types.h" #include "DNA_key_types.h" +#include "MEM_guardedalloc.h" + #include "RNA_define.h" #include "RNA_access.h" @@ -66,8 +66,6 @@ editmesh_tool.c: UI called tools for editmesh, geometry changes here, otherwise #include "BKE_bmesh.h" #include "BKE_report.h" -#include "BIF_gl.h" -#include "BIF_glutil.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/mesh/loopcut.c b/source/blender/editors/mesh/loopcut.c index 876cafd4bfb..488b59fa29e 100644 --- a/source/blender/editors/mesh/loopcut.c +++ b/source/blender/editors/mesh/loopcut.c @@ -59,7 +59,6 @@ #include "IMB_imbuf_types.h" #include "ED_screen.h" -#include "ED_util.h" #include "ED_space_api.h" #include "ED_view3d.h" #include "ED_mesh.h" diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c index a02ed82b45a..6562a4b30ae 100644 --- a/source/blender/editors/mesh/mesh_ops.c +++ b/source/blender/editors/mesh/mesh_ops.c @@ -29,7 +29,6 @@ #include <stdlib.h> #include <math.h> -#include "MEM_guardedalloc.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 36879e43fe2..78404959dff 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -34,7 +34,11 @@ #include "MEM_guardedalloc.h" -#include "IMB_imbuf_types.h" +#include "BLI_blenlib.h" +#include "BLI_math.h" +#include "BLI_editVert.h" +#include "BLI_ghash.h" +#include "BLI_rand.h" #include "DNA_armature_types.h" #include "DNA_curve_types.h" @@ -48,11 +52,7 @@ #include "DNA_meshdata_types.h" #include "DNA_vfont_types.h" -#include "BLI_blenlib.h" -#include "BLI_math.h" -#include "BLI_editVert.h" -#include "BLI_ghash.h" -#include "BLI_rand.h" +#include "IMB_imbuf_types.h" #include "BKE_anim.h" #include "BKE_constraint.h" diff --git a/source/blender/editors/object/object_group.c b/source/blender/editors/object/object_group.c index 8a0e598af9f..f000485466f 100644 --- a/source/blender/editors/object/object_group.c +++ b/source/blender/editors/object/object_group.c @@ -29,7 +29,6 @@ #include <string.h> -#include "MEM_guardedalloc.h" #include "BLI_blenlib.h" diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c index 97dc6f7486c..190c4ebc228 100644 --- a/source/blender/editors/object/object_ops.c +++ b/source/blender/editors/object/object_ops.c @@ -29,7 +29,6 @@ #include <stdlib.h> #include <math.h> -#include "MEM_guardedalloc.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index bbafde60755..813f562f380 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -55,7 +55,6 @@ #include "WM_types.h" #include "ED_armature.h" -#include "ED_curve.h" #include "ED_keyframing.h" #include "ED_mesh.h" #include "ED_screen.h" diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index cbfc984337e..f411f92d395 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -77,7 +77,6 @@ #include "LBM_fluidsim.h" -#include "BIF_gl.h" #include "ED_screen.h" diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index 2561a2c8dbc..2b579ef8af3 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -81,7 +81,6 @@ #include "WM_api.h" #include "WM_types.h" -#include "ED_datafiles.h" #include "ED_render.h" #include "ED_view3d.h" diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 7f7c52a416e..dd77bfc4fd5 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -51,7 +51,6 @@ #include "ED_image.h" #include "ED_object.h" -#include "ED_view3d.h" #include "ED_screen.h" #include "ED_screen_types.h" diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index 198ec4fee3b..553343a8b21 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -38,13 +38,13 @@ #include "MEM_guardedalloc.h" -#include "IMB_imbuf.h" -#include "IMB_imbuf_types.h" - #include "BLI_blenlib.h" #include "BLI_math.h" #include "BLI_ghash.h" +#include "IMB_imbuf.h" +#include "IMB_imbuf_types.h" + #include "DNA_armature_types.h" #include "DNA_mesh_types.h" #include "DNA_particle_types.h" @@ -70,8 +70,6 @@ #include "WM_api.h" #include "WM_types.h" -#include "BIF_gl.h" -#include "BIF_glutil.h" #include "ED_armature.h" #include "ED_mesh.h" diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index dabb5b84326..d8df9684cff 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -64,9 +64,7 @@ #include "WM_api.h" #include "WM_types.h" #include "ED_screen.h" -#include "ED_sculpt.h" #include "ED_view3d.h" -#include "ED_mesh.h" #include "paint_intern.h" #include "sculpt_intern.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c b/source/blender/editors/sculpt_paint/sculpt_undo.c index b6b796bce2b..e92740678fd 100644 --- a/source/blender/editors/sculpt_paint/sculpt_undo.c +++ b/source/blender/editors/sculpt_paint/sculpt_undo.c @@ -30,6 +30,8 @@ * */ +#include "MEM_guardedalloc.h" + #include "BLI_math.h" #include "BLI_ghash.h" #include "BLI_threads.h" diff --git a/source/blender/editors/space_action/action_draw.c b/source/blender/editors/space_action/action_draw.c index 0d1ab8a2c0f..d2067790b2f 100644 --- a/source/blender/editors/space_action/action_draw.c +++ b/source/blender/editors/space_action/action_draw.c @@ -34,7 +34,6 @@ #include <string.h> #include <float.h> -#include "MEM_guardedalloc.h" #include "BLI_blenlib.h" #include "BLI_math.h" @@ -51,7 +50,6 @@ /* Everything from source (BIF, BDR, BSE) ------------------------------ */ #include "BIF_gl.h" -#include "BIF_glutil.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c index 99160cfab7b..916b0032f17 100644 --- a/source/blender/editors/space_action/action_edit.c +++ b/source/blender/editors/space_action/action_edit.c @@ -32,7 +32,6 @@ #include <string.h> #include <float.h> -#include "MEM_guardedalloc.h" #include "BLI_blenlib.h" #include "BLI_math.h" diff --git a/source/blender/editors/space_action/action_ops.c b/source/blender/editors/space_action/action_ops.c index 73148f016b0..19dd4512909 100644 --- a/source/blender/editors/space_action/action_ops.c +++ b/source/blender/editors/space_action/action_ops.c @@ -29,7 +29,6 @@ #include <stdlib.h> #include <math.h> -#include "MEM_guardedalloc.h" #include "DNA_space_types.h" diff --git a/source/blender/editors/space_api/space.c b/source/blender/editors/space_api/space.c index 111c22c3542..e862358c465 100644 --- a/source/blender/editors/space_api/space.c +++ b/source/blender/editors/space_api/space.c @@ -29,7 +29,6 @@ #include <string.h> #include <stdio.h> -#include "MEM_guardedalloc.h" #include "BLI_blenlib.h" #include "BLI_math.h" diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c index d841a5a7c19..2140c59da67 100644 --- a/source/blender/editors/space_api/spacetypes.c +++ b/source/blender/editors/space_api/spacetypes.c @@ -36,7 +36,6 @@ #include "UI_interface.h" #include "UI_view2d.h" -#include "BIF_gl.h" #include "ED_anim_api.h" #include "ED_armature.h" diff --git a/source/blender/editors/space_buttons/buttons_header.c b/source/blender/editors/space_buttons/buttons_header.c index c7f80f4d724..ab756b638fa 100644 --- a/source/blender/editors/space_buttons/buttons_header.c +++ b/source/blender/editors/space_buttons/buttons_header.c @@ -30,7 +30,6 @@ #include <stdio.h> -#include "MEM_guardedalloc.h" #include "BLI_blenlib.h" @@ -40,8 +39,6 @@ #include "ED_types.h" -#include "BIF_gl.h" -#include "BIF_glutil.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/space_console/console_draw.c b/source/blender/editors/space_console/console_draw.c index f9deac6c753..74d47ad675d 100644 --- a/source/blender/editors/space_console/console_draw.c +++ b/source/blender/editors/space_console/console_draw.c @@ -33,7 +33,6 @@ #include <sys/stat.h> #include <limits.h> -#include "MEM_guardedalloc.h" #include "BLF_api.h" diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c index 0dbd1048348..52d59270663 100644 --- a/source/blender/editors/space_file/filesel.c +++ b/source/blender/editors/space_file/filesel.c @@ -73,8 +73,6 @@ #include "WM_api.h" #include "WM_types.h" -#include "BIF_gl.h" -#include "BIF_glutil.h" #include "RNA_access.h" diff --git a/source/blender/editors/space_file/writeimage.c b/source/blender/editors/space_file/writeimage.c index 39cd48b1d8a..b69bfdc0231 100644 --- a/source/blender/editors/space_file/writeimage.c +++ b/source/blender/editors/space_file/writeimage.c @@ -29,7 +29,6 @@ #include <string.h> -#include "MEM_guardedalloc.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c index 4e7661b12ac..a7d5b2dd074 100644 --- a/source/blender/editors/space_graph/graph_buttons.c +++ b/source/blender/editors/space_graph/graph_buttons.c @@ -48,7 +48,6 @@ #include "BKE_main.h" #include "BKE_screen.h" -#include "BIF_gl.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_graph/graph_draw.c b/source/blender/editors/space_graph/graph_draw.c index b9ef1d80ec3..f780a6c31ee 100644 --- a/source/blender/editors/space_graph/graph_draw.c +++ b/source/blender/editors/space_graph/graph_draw.c @@ -35,7 +35,6 @@ #include <io.h> #endif -#include "MEM_guardedalloc.h" #include "BLI_blenlib.h" #include "BLI_math.h" diff --git a/source/blender/editors/space_graph/graph_ops.c b/source/blender/editors/space_graph/graph_ops.c index 66d07c3bd11..0069e6e0675 100644 --- a/source/blender/editors/space_graph/graph_ops.c +++ b/source/blender/editors/space_graph/graph_ops.c @@ -29,7 +29,6 @@ #include <stdlib.h> #include <math.h> -#include "MEM_guardedalloc.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/space_graph/graph_utils.c b/source/blender/editors/space_graph/graph_utils.c index 7b8bf8c7973..927149a268d 100644 --- a/source/blender/editors/space_graph/graph_utils.c +++ b/source/blender/editors/space_graph/graph_utils.c @@ -45,7 +45,6 @@ #include "BKE_context.h" #include "BKE_fcurve.h" -#include "BIF_gl.h" #include "WM_api.h" diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index 40f048ceadb..7c84f0219e0 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -59,8 +59,6 @@ #include "ED_screen.h" #include "ED_uvedit.h" -#include "BIF_gl.h" -#include "BIF_glutil.h" #include "RNA_access.h" diff --git a/source/blender/editors/space_image/image_header.c b/source/blender/editors/space_image/image_header.c index 5ccd479da96..7ecb2565e72 100644 --- a/source/blender/editors/space_image/image_header.c +++ b/source/blender/editors/space_image/image_header.c @@ -33,7 +33,6 @@ #include "DNA_space_types.h" #include "DNA_windowmanager_types.h" -#include "MEM_guardedalloc.h" #include "BLI_blenlib.h" #include "BLI_editVert.h" @@ -45,8 +44,6 @@ #include "WM_types.h" -#include "BIF_gl.h" -#include "BIF_glutil.h" #include "UI_interface.h" diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index ca71b021630..0b8a2d8f843 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -46,7 +46,6 @@ #include "BKE_mesh.h" #include "BKE_screen.h" -#include "IMB_imbuf.h" #include "IMB_imbuf_types.h" #include "ED_mesh.h" @@ -55,7 +54,6 @@ #include "ED_uvedit.h" #include "BIF_gl.h" -#include "BIF_glutil.h" #include "RNA_access.h" diff --git a/source/blender/editors/space_info/info_ops.c b/source/blender/editors/space_info/info_ops.c index 202e79f2c2d..51767d3e006 100644 --- a/source/blender/editors/space_info/info_ops.c +++ b/source/blender/editors/space_info/info_ops.c @@ -50,8 +50,6 @@ #include "WM_api.h" #include "WM_types.h" -#include "BIF_gl.h" -#include "BIF_glutil.h" #include "UI_interface.h" diff --git a/source/blender/editors/space_logic/logic_buttons.c b/source/blender/editors/space_logic/logic_buttons.c index 3787ac6213d..d8dfd8cb52d 100644 --- a/source/blender/editors/space_logic/logic_buttons.c +++ b/source/blender/editors/space_logic/logic_buttons.c @@ -28,7 +28,6 @@ #include <stdio.h> -#include "MEM_guardedalloc.h" #include "BLI_blenlib.h" #include "BLI_math.h" @@ -38,8 +37,6 @@ #include "ED_screen.h" -#include "BIF_gl.h" -#include "BIF_glutil.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c index 798c7639d7e..511ca99ff82 100644 --- a/source/blender/editors/space_logic/logic_window.c +++ b/source/blender/editors/space_logic/logic_window.c @@ -57,7 +57,6 @@ #include "WM_types.h" #include "BIF_gl.h" -#include "BIF_glutil.h" #include "UI_interface.h" diff --git a/source/blender/editors/space_logic/space_logic.c b/source/blender/editors/space_logic/space_logic.c index d4d07b7c14e..01af324334b 100644 --- a/source/blender/editors/space_logic/space_logic.c +++ b/source/blender/editors/space_logic/space_logic.c @@ -41,7 +41,6 @@ #include "ED_screen.h" #include "BIF_gl.h" -#include "BIF_glutil.h" #include "WM_api.h" diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index e31d7635f7a..86f783733b5 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -44,7 +44,6 @@ #include "BKE_context.h" #include "BKE_screen.h" -#include "BIF_gl.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c index d834fb07ee7..b00cba676d0 100644 --- a/source/blender/editors/space_nla/nla_channels.c +++ b/source/blender/editors/space_nla/nla_channels.c @@ -35,7 +35,6 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "MEM_guardedalloc.h" #include "BLI_blenlib.h" #include "BLI_math.h" diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c index 2568baf0f0a..f489fc4774f 100644 --- a/source/blender/editors/space_nla/nla_draw.c +++ b/source/blender/editors/space_nla/nla_draw.c @@ -37,7 +37,6 @@ #include "DNA_space_types.h" #include "DNA_windowmanager_types.h" -#include "MEM_guardedalloc.h" #include "BLI_blenlib.h" #include "BLI_math.h" diff --git a/source/blender/editors/space_nla/nla_ops.c b/source/blender/editors/space_nla/nla_ops.c index 9c7eee39e29..85a169f2bb0 100644 --- a/source/blender/editors/space_nla/nla_ops.c +++ b/source/blender/editors/space_nla/nla_ops.c @@ -31,7 +31,6 @@ #include "DNA_scene_types.h" -#include "MEM_guardedalloc.h" #include "BLI_blenlib.h" #include "BLI_math.h" diff --git a/source/blender/editors/space_node/node_buttons.c b/source/blender/editors/space_node/node_buttons.c index 65925b1e9a2..11319d817c7 100644 --- a/source/blender/editors/space_node/node_buttons.c +++ b/source/blender/editors/space_node/node_buttons.c @@ -44,7 +44,6 @@ #include "BKE_node.h" #include "BKE_screen.h" -#include "BIF_gl.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index 0e33dff82a6..cc7c966e397 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -40,7 +40,6 @@ #include "BLI_math.h" #include "BLI_blenlib.h" #include "BLI_threads.h" -#include "MEM_guardedalloc.h" #include "BKE_context.h" #include "BKE_depsgraph.h" diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index 9fb4facdcc8..829c74fd26d 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -51,7 +51,6 @@ #include "BKE_texture.h" #include "BKE_report.h" -#include "BIF_gl.h" #include "BLI_math.h" #include "BLI_blenlib.h" diff --git a/source/blender/editors/space_node/node_header.c b/source/blender/editors/space_node/node_header.c index d98bb766e3a..17c50b32e98 100644 --- a/source/blender/editors/space_node/node_header.c +++ b/source/blender/editors/space_node/node_header.c @@ -47,8 +47,6 @@ #include "WM_api.h" #include "WM_types.h" -#include "BIF_gl.h" -#include "BIF_glutil.h" #include "UI_interface.h" diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c index 9f50245551e..d9a4dda9d6e 100644 --- a/source/blender/editors/space_node/space_node.c +++ b/source/blender/editors/space_node/space_node.c @@ -46,7 +46,6 @@ #include "ED_render.h" #include "ED_screen.h" -#include "BIF_gl.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c index fc08f3390c9..fd9d46d5699 100644 --- a/source/blender/editors/space_outliner/outliner.c +++ b/source/blender/editors/space_outliner/outliner.c @@ -59,7 +59,6 @@ # include <fnmatch.h> #endif -#include "IMB_imbuf_types.h" #include "BKE_animsys.h" #include "BKE_context.h" diff --git a/source/blender/editors/space_outliner/space_outliner.c b/source/blender/editors/space_outliner/space_outliner.c index 829538b9174..d3db64d6d03 100644 --- a/source/blender/editors/space_outliner/space_outliner.c +++ b/source/blender/editors/space_outliner/space_outliner.c @@ -45,7 +45,6 @@ #include "WM_types.h" #include "BIF_gl.h" -#include "BIF_glutil.h" #include "UI_resources.h" #include "UI_view2d.h" diff --git a/source/blender/editors/space_script/script_edit.c b/source/blender/editors/space_script/script_edit.c index fe5ecd10eb1..610fecaa543 100644 --- a/source/blender/editors/space_script/script_edit.c +++ b/source/blender/editors/space_script/script_edit.c @@ -30,7 +30,6 @@ #include <stdio.h> -#include "MEM_guardedalloc.h" #include "BLI_blenlib.h" diff --git a/source/blender/editors/space_script/script_header.c b/source/blender/editors/space_script/script_header.c index 4fc6aa78f66..6e65d458451 100644 --- a/source/blender/editors/space_script/script_header.c +++ b/source/blender/editors/space_script/script_header.c @@ -30,7 +30,6 @@ #include <stdio.h> -#include "MEM_guardedalloc.h" #include "BLI_blenlib.h" @@ -41,8 +40,6 @@ #include "ED_util.h" -#include "BIF_gl.h" -#include "BIF_glutil.h" #include "UI_interface.h" #include "UI_resources.h" diff --git a/source/blender/editors/space_script/script_ops.c b/source/blender/editors/space_script/script_ops.c index e392f8d6e12..a52ffbd0808 100644 --- a/source/blender/editors/space_script/script_ops.c +++ b/source/blender/editors/space_script/script_ops.c @@ -29,7 +29,6 @@ #include <stdlib.h> #include <math.h> -#include "MEM_guardedalloc.h" #include "DNA_screen_types.h" #include "DNA_space_types.h" diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index c426cd9fdc2..e58e2ebb328 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -51,8 +51,6 @@ #include "BKE_sequencer.h" #include "BKE_report.h" -#include "BIF_gl.h" -#include "BIF_glutil.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_sequencer/sequencer_ops.c b/source/blender/editors/space_sequencer/sequencer_ops.c index 6d1c6aa45a8..6ca0a13f172 100644 --- a/source/blender/editors/space_sequencer/sequencer_ops.c +++ b/source/blender/editors/space_sequencer/sequencer_ops.c @@ -30,7 +30,6 @@ #include <stdlib.h> #include <math.h> -#include "MEM_guardedalloc.h" #include "DNA_space_types.h" diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index ecc7aa0c630..a61e05517d9 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -35,7 +35,6 @@ #endif #include <sys/types.h> -#include "MEM_guardedalloc.h" #include "BLI_blenlib.h" #include "BLI_math.h" diff --git a/source/blender/editors/space_text/text_draw.c b/source/blender/editors/space_text/text_draw.c index 2e5bb4a63e0..051202b28ef 100644 --- a/source/blender/editors/space_text/text_draw.c +++ b/source/blender/editors/space_text/text_draw.c @@ -49,7 +49,6 @@ #include "BKE_utildefines.h" #include "BIF_gl.h" -#include "BIF_glutil.h" #include "ED_datafiles.h" #include "UI_interface.h" diff --git a/source/blender/editors/space_text/text_header.c b/source/blender/editors/space_text/text_header.c index 4b37994c39e..672940cf3cb 100644 --- a/source/blender/editors/space_text/text_header.c +++ b/source/blender/editors/space_text/text_header.c @@ -54,13 +54,10 @@ #include "WM_types.h" -#include "BIF_gl.h" -#include "BIF_glutil.h" #ifndef DISABLE_PYTHON -#include "BPY_extern.h" // XXX #include "BPY_menus.h" #endif diff --git a/source/blender/editors/space_time/time_ops.c b/source/blender/editors/space_time/time_ops.c index 95e8a724d32..fb80d54d5e6 100644 --- a/source/blender/editors/space_time/time_ops.c +++ b/source/blender/editors/space_time/time_ops.c @@ -29,7 +29,6 @@ #include <stdlib.h> #include <math.h> -#include "MEM_guardedalloc.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/space_userpref/space_userpref.c b/source/blender/editors/space_userpref/space_userpref.c index 4d6d303625b..8eea83a1083 100644 --- a/source/blender/editors/space_userpref/space_userpref.c +++ b/source/blender/editors/space_userpref/space_userpref.c @@ -39,7 +39,6 @@ #include "ED_screen.h" -#include "BIF_gl.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_view3d/drawanimviz.c b/source/blender/editors/space_view3d/drawanimviz.c index 2de51c2dd92..fb271556a9c 100644 --- a/source/blender/editors/space_view3d/drawanimviz.c +++ b/source/blender/editors/space_view3d/drawanimviz.c @@ -31,7 +31,6 @@ #include <string.h> #include <math.h> -#include "MEM_guardedalloc.h" #include "DNA_anim_types.h" #include "DNA_armature_types.h" @@ -48,7 +47,6 @@ #include "BKE_action.h" #include "BIF_gl.h" -#include "BIF_glutil.h" #include "ED_armature.h" #include "ED_keyframes_draw.h" diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c index 3222f2396a4..adff6ffdc65 100644 --- a/source/blender/editors/space_view3d/drawarmature.c +++ b/source/blender/editors/space_view3d/drawarmature.c @@ -31,7 +31,6 @@ #include <string.h> #include <math.h> -#include "MEM_guardedalloc.h" #include "DNA_anim_types.h" #include "DNA_armature_types.h" diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c index 406435bb149..65786901868 100644 --- a/source/blender/editors/space_view3d/drawvolume.c +++ b/source/blender/editors/space_view3d/drawvolume.c @@ -69,7 +69,6 @@ #include "smoke_API.h" #include "BIF_gl.h" -#include "BIF_glutil.h" #include "GPU_extensions.h" diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index e6c8ff2c268..19d182de54b 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -56,7 +56,6 @@ #include "BKE_screen.h" #include "BKE_deform.h" -#include "BIF_gl.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 840cedd8360..048a0d95617 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -75,7 +75,6 @@ #include "ED_space_api.h" #include "ED_screen_types.h" #include "ED_transform.h" -#include "ED_gpencil.h" #include "UI_interface.h" #include "UI_interface_icons.h" diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index aa7e0e51cae..08dde98b4ef 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -58,8 +58,6 @@ #include "RNA_define.h" #include "RNA_enum_types.h" -#include "BIF_gl.h" -#include "BIF_glutil.h" #include "BLI_math.h" #include "BLI_blenlib.h" diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c index d230085716d..2734e580782 100644 --- a/source/blender/editors/space_view3d/view3d_ops.c +++ b/source/blender/editors/space_view3d/view3d_ops.c @@ -29,7 +29,6 @@ #include <stdlib.h> #include <math.h> -#include "MEM_guardedalloc.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/space_view3d/view3d_toolbar.c b/source/blender/editors/space_view3d/view3d_toolbar.c index 7cb6921902c..e47a3af19f1 100644 --- a/source/blender/editors/space_view3d/view3d_toolbar.c +++ b/source/blender/editors/space_view3d/view3d_toolbar.c @@ -46,7 +46,6 @@ #include "BKE_global.h" #include "BKE_screen.h" -#include "BIF_gl.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c index 3abd2dc25c1..1e6916f0a86 100644 --- a/source/blender/editors/transform/transform_constraints.c +++ b/source/blender/editors/transform/transform_constraints.c @@ -38,7 +38,6 @@ #include <io.h> #endif -#include "MEM_guardedalloc.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index fa0a9f7f832..ebc3ad89c95 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -35,8 +35,6 @@ #include <string.h> #include <math.h> -#include "MEM_guardedalloc.h" - #include "DNA_anim_types.h" #include "DNA_armature_types.h" #include "DNA_lattice_types.h" @@ -50,6 +48,8 @@ #include "DNA_scene_types.h" #include "DNA_meshdata_types.h" +#include "MEM_guardedalloc.h" + #include "BKE_action.h" #include "BKE_armature.h" #include "BKE_context.h" @@ -69,7 +69,6 @@ #include "BKE_bmesh.h" #include "BKE_scene.h" -#include "BIF_gl.h" #include "ED_anim_api.h" #include "ED_armature.h" diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 742001cae74..d244b2f6b30 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -54,7 +54,6 @@ //#include "editmesh.h" //#include "BIF_editsima.h" #include "BIF_gl.h" -#include "BIF_glutil.h" //#include "BIF_mywindow.h" //#include "BIF_screen.h" //#include "BIF_editsima.h" |