diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-11-07 17:37:31 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-11-07 22:58:53 +0300 |
commit | 4b2110fc86e59136efd7ea294453678e848b4b74 (patch) | |
tree | 5b313949860b4b73839a5be6a7d2d94d4641955e /source/blender/blenkernel | |
parent | 4779165ca18ae3ced005aad129575b70fc6c4f9d (diff) |
Cleanup: Remove 'BKE_library.h' include from 'BKE_main.h'
That kind of implicit includes should really only be done when totally,
absolutely necessary, and ideally only with rather simple 'second-level'
headers.
Otherwise not being explicit with includes always end up biting in
unexpected ways...
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_main.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/blender_undo.c | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/customdata.c | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/lightprobe.c | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/packedFile.c | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/pointcache.c | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/undo_system.c | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/writeavi.c | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/writeffmpeg.c | 1 |
11 files changed, 12 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_main.h b/source/blender/blenkernel/BKE_main.h index 0913cf208eb..492962f3b00 100644 --- a/source/blender/blenkernel/BKE_main.h +++ b/source/blender/blenkernel/BKE_main.h @@ -42,8 +42,6 @@ */ #include "DNA_listBase.h" -#include "BKE_library.h" - #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/blenkernel/intern/blender_undo.c b/source/blender/blenkernel/intern/blender_undo.c index 47e1def2aba..a00ad5ff05f 100644 --- a/source/blender/blenkernel/intern/blender_undo.c +++ b/source/blender/blenkernel/intern/blender_undo.c @@ -46,11 +46,12 @@ #include "BLI_string.h" #include "BLI_utildefines.h" +#include "BKE_appdir.h" #include "BKE_blender_undo.h" /* own include */ #include "BKE_blendfile.h" -#include "BKE_appdir.h" #include "BKE_context.h" #include "BKE_global.h" +#include "BKE_library.h" #include "BKE_main.h" #include "BLO_undofile.h" diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 765c42b39b0..a0fa08708b1 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -53,6 +53,7 @@ #include "BKE_customdata.h" #include "BKE_customdata_file.h" #include "BKE_global.h" +#include "BKE_library.h" #include "BKE_main.h" #include "BKE_mesh_mapping.h" #include "BKE_mesh_remap.h" diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 9f2ebab6bd9..8c39b50101b 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -65,6 +65,7 @@ #include "BKE_effect.h" #include "BKE_global.h" #include "BKE_image.h" +#include "BKE_library.h" #include "BKE_main.h" #include "BKE_material.h" #include "BKE_mesh.h" diff --git a/source/blender/blenkernel/intern/lightprobe.c b/source/blender/blenkernel/intern/lightprobe.c index baf0cdbe62f..4cb2b450afe 100644 --- a/source/blender/blenkernel/intern/lightprobe.c +++ b/source/blender/blenkernel/intern/lightprobe.c @@ -37,8 +37,9 @@ #include "BKE_animsys.h" #include "BKE_global.h" -#include "BKE_main.h" +#include "BKE_library.h" #include "BKE_lightprobe.h" +#include "BKE_main.h" void BKE_lightprobe_init(LightProbe *probe) { diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c index 8d7a832671f..0446b697c68 100644 --- a/source/blender/blenkernel/intern/packedFile.c +++ b/source/blender/blenkernel/intern/packedFile.c @@ -54,6 +54,7 @@ #include "BKE_font.h" #include "BKE_global.h" #include "BKE_image.h" +#include "BKE_library.h" #include "BKE_main.h" #include "BKE_packedFile.h" #include "BKE_report.h" diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 7fc36c423c1..99451a7b6c1 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -63,6 +63,7 @@ #include "BKE_collection.h" #include "BKE_dynamicpaint.h" #include "BKE_global.h" +#include "BKE_library.h" #include "BKE_main.h" #include "BKE_modifier.h" #include "BKE_object.h" diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index ced6cf0fe74..4a403d337b3 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -73,6 +73,7 @@ #include "BKE_deform.h" #include "BKE_effect.h" #include "BKE_global.h" +#include "BKE_library.h" #include "BKE_main.h" #include "BKE_mesh.h" #include "BKE_mesh_runtime.h" diff --git a/source/blender/blenkernel/intern/undo_system.c b/source/blender/blenkernel/intern/undo_system.c index ae98a765124..abc53bf031a 100644 --- a/source/blender/blenkernel/intern/undo_system.c +++ b/source/blender/blenkernel/intern/undo_system.c @@ -39,6 +39,7 @@ #include "BKE_context.h" #include "BKE_global.h" +#include "BKE_library.h" #include "BKE_library_override.h" #include "BKE_main.h" #include "BKE_undo_system.h" diff --git a/source/blender/blenkernel/intern/writeavi.c b/source/blender/blenkernel/intern/writeavi.c index 1db239b3c6f..a1732b79ea3 100644 --- a/source/blender/blenkernel/intern/writeavi.c +++ b/source/blender/blenkernel/intern/writeavi.c @@ -43,6 +43,7 @@ #include "BLI_utildefines.h" #include "BKE_global.h" +#include "BKE_library.h" #include "BKE_main.h" #include "BKE_report.h" diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index d53cba184ad..06f11301acb 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -54,6 +54,7 @@ #include "BKE_global.h" #include "BKE_idprop.h" #include "BKE_image.h" +#include "BKE_library.h" #include "BKE_main.h" #include "BKE_report.h" #include "BKE_sound.h" |