From 4b2110fc86e59136efd7ea294453678e848b4b74 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 7 Nov 2018 15:37:31 +0100 Subject: 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... --- source/blender/modifiers/intern/MOD_fluidsim_util.c | 5 +++-- source/blender/modifiers/intern/MOD_meshcache.c | 5 +++-- source/blender/modifiers/intern/MOD_ocean.c | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) (limited to 'source/blender/modifiers/intern') diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.c b/source/blender/modifiers/intern/MOD_fluidsim_util.c index fc1235b3a29..23a62f88f77 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim_util.c +++ b/source/blender/modifiers/intern/MOD_fluidsim_util.c @@ -47,11 +47,12 @@ #include "BLI_utildefines.h" #include "BKE_fluidsim.h" /* ensure definitions here match */ -#include "BKE_main.h" -#include "BKE_mesh.h" #ifdef WITH_MOD_FLUID # include "BKE_global.h" #endif +#include "BKE_library.h" +#include "BKE_main.h" +#include "BKE_mesh.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/modifiers/intern/MOD_meshcache.c b/source/blender/modifiers/intern/MOD_meshcache.c index 30baf64aada..e3aa239a713 100644 --- a/source/blender/modifiers/intern/MOD_meshcache.c +++ b/source/blender/modifiers/intern/MOD_meshcache.c @@ -36,10 +36,11 @@ #include "BLI_path_util.h" #include "BLI_math.h" -#include "BKE_scene.h" #include "BKE_global.h" -#include "BKE_mesh.h" +#include "BKE_library.h" #include "BKE_main.h" +#include "BKE_mesh.h" +#include "BKE_scene.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c index 50eae12d034..8231745aa12 100644 --- a/source/blender/modifiers/intern/MOD_ocean.c +++ b/source/blender/modifiers/intern/MOD_ocean.c @@ -42,6 +42,7 @@ #include "BLI_utildefines.h" #include "BKE_global.h" +#include "BKE_library.h" #include "BKE_main.h" #include "BKE_mesh.h" #include "BKE_modifier.h" -- cgit v1.2.3