From 64ec05b64d106623f63dd308d0950866a22b6229 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 7 Nov 2018 18:00:24 +0100 Subject: Cleanup: remove some useless BKE_library and BKE_main includes. Makes it simpler to make some changes... Also fix order of some includes (use alphabetical please). --- source/blender/windowmanager/intern/wm.c | 4 ++-- source/blender/windowmanager/intern/wm_files.c | 1 - source/blender/windowmanager/intern/wm_files_link.c | 2 +- source/blender/windowmanager/intern/wm_init_exit.c | 5 ++--- source/blender/windowmanager/intern/wm_menu_type.c | 1 - source/blender/windowmanager/intern/wm_operator_type.c | 1 - source/blender/windowmanager/intern/wm_operators.c | 2 +- source/blender/windowmanager/intern/wm_toolsystem.c | 2 +- source/blender/windowmanager/intern/wm_uilist_type.c | 1 - source/blender/windowmanager/intern/wm_window.c | 3 +-- 10 files changed, 8 insertions(+), 14 deletions(-) (limited to 'source/blender/windowmanager') diff --git a/source/blender/windowmanager/intern/wm.c b/source/blender/windowmanager/intern/wm.c index 7247529d02d..cf7c43ff5c0 100644 --- a/source/blender/windowmanager/intern/wm.c +++ b/source/blender/windowmanager/intern/wm.c @@ -46,12 +46,12 @@ #include "BLI_ghash.h" #include "BKE_context.h" +#include "BKE_global.h" #include "BKE_idprop.h" #include "BKE_library.h" #include "BKE_main.h" -#include "BKE_screen.h" #include "BKE_report.h" -#include "BKE_global.h" +#include "BKE_screen.h" #include "BKE_workspace.h" #include "WM_api.h" diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index a1a20397f99..60d64e6ea5b 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -79,7 +79,6 @@ #include "BKE_blender_undo.h" #include "BKE_context.h" #include "BKE_global.h" -#include "BKE_library.h" #include "BKE_main.h" #include "BKE_packedFile.h" #include "BKE_report.h" diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c index a1e298b91d0..0b1ba6cf32d 100644 --- a/source/blender/windowmanager/intern/wm_files_link.c +++ b/source/blender/windowmanager/intern/wm_files_link.c @@ -59,10 +59,10 @@ #include "BLO_readfile.h" #include "BKE_context.h" +#include "BKE_global.h" #include "BKE_layer.h" #include "BKE_library.h" #include "BKE_library_remap.h" -#include "BKE_global.h" #include "BKE_main.h" #include "BKE_report.h" #include "BKE_scene.h" diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index fb7b6078c5f..52f609700b3 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -61,16 +61,15 @@ #include "BKE_blender.h" #include "BKE_blender_undo.h" #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_font.h" #include "BKE_global.h" #include "BKE_icons.h" -#include "BKE_library.h" #include "BKE_library_remap.h" #include "BKE_main.h" #include "BKE_mball_tessellate.h" #include "BKE_node.h" #include "BKE_report.h" -#include "BKE_font.h" +#include "BKE_screen.h" #include "BKE_addon.h" #include "BKE_appdir.h" diff --git a/source/blender/windowmanager/intern/wm_menu_type.c b/source/blender/windowmanager/intern/wm_menu_type.c index 97ca5690954..c8bce13b27c 100644 --- a/source/blender/windowmanager/intern/wm_menu_type.c +++ b/source/blender/windowmanager/intern/wm_menu_type.c @@ -35,7 +35,6 @@ #include "BLI_ghash.h" #include "BKE_context.h" -#include "BKE_library.h" #include "BKE_screen.h" #include "BKE_workspace.h" diff --git a/source/blender/windowmanager/intern/wm_operator_type.c b/source/blender/windowmanager/intern/wm_operator_type.c index 89421ac0ab0..33613d97f03 100644 --- a/source/blender/windowmanager/intern/wm_operator_type.c +++ b/source/blender/windowmanager/intern/wm_operator_type.c @@ -42,7 +42,6 @@ #include "BKE_context.h" #include "BKE_idprop.h" -#include "BKE_library.h" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 6c9cbbcee57..7862ed9fd1b 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -73,12 +73,12 @@ #include "BKE_blender_version.h" #include "BKE_brush.h" #include "BKE_context.h" +#include "BKE_global.h" #include "BKE_icons.h" #include "BKE_idprop.h" #include "BKE_image.h" #include "BKE_library.h" #include "BKE_library_query.h" -#include "BKE_global.h" #include "BKE_main.h" #include "BKE_material.h" #include "BKE_report.h" diff --git a/source/blender/windowmanager/intern/wm_toolsystem.c b/source/blender/windowmanager/intern/wm_toolsystem.c index 565d52c230b..333b71fead6 100644 --- a/source/blender/windowmanager/intern/wm_toolsystem.c +++ b/source/blender/windowmanager/intern/wm_toolsystem.c @@ -43,10 +43,10 @@ #include "BKE_brush.h" #include "BKE_context.h" +#include "BKE_idprop.h" #include "BKE_library.h" #include "BKE_main.h" #include "BKE_paint.h" -#include "BKE_idprop.h" #include "BKE_workspace.h" #include "RNA_access.h" diff --git a/source/blender/windowmanager/intern/wm_uilist_type.c b/source/blender/windowmanager/intern/wm_uilist_type.c index 52619a09218..f0ffa5905fc 100644 --- a/source/blender/windowmanager/intern/wm_uilist_type.c +++ b/source/blender/windowmanager/intern/wm_uilist_type.c @@ -34,7 +34,6 @@ #include "BLI_ghash.h" #include "BKE_context.h" -#include "BKE_library.h" #include "BKE_screen.h" #include "WM_api.h" diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 679b45628b1..b84b851476a 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -52,10 +52,9 @@ #include "BKE_blender.h" #include "BKE_context.h" +#include "BKE_global.h" #include "BKE_icons.h" #include "BKE_layer.h" -#include "BKE_library.h" -#include "BKE_global.h" #include "BKE_main.h" #include "BKE_screen.h" #include "BKE_workspace.h" -- cgit v1.2.3