From aaafa0c2fe2fefacd454e7c4ca30122be2206923 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 3 Sep 2012 22:04:14 +0000 Subject: code cleanup: move file string defines into BLI_path_utils.h, BKE_utildefines is now unused but keep incase we want to add defines there later. --- source/blender/imbuf/intern/IMB_indexer.h | 1 - source/blender/imbuf/intern/indexer.c | 10 ++++++---- source/blender/imbuf/intern/indexer_dv.c | 5 ++++- source/blender/imbuf/intern/thumbs.c | 2 -- source/blender/imbuf/intern/thumbs_blend.c | 1 - 5 files changed, 10 insertions(+), 9 deletions(-) (limited to 'source/blender/imbuf/intern') diff --git a/source/blender/imbuf/intern/IMB_indexer.h b/source/blender/imbuf/intern/IMB_indexer.h index 16d10a5c41c..18816924a9b 100644 --- a/source/blender/imbuf/intern/IMB_indexer.h +++ b/source/blender/imbuf/intern/IMB_indexer.h @@ -31,7 +31,6 @@ #include #include -#include "BKE_utildefines.h" #include "IMB_anim.h" /* * separate animation index files to solve the following problems: diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c index 702e9872a91..458f0198aed 100644 --- a/source/blender/imbuf/intern/indexer.c +++ b/source/blender/imbuf/intern/indexer.c @@ -24,19 +24,21 @@ #include -#include "IMB_indexer.h" -#include "IMB_anim.h" -#include "AVI_avi.h" -#include "imbuf.h" #include "MEM_guardedalloc.h" #include "BLI_utildefines.h" #include "BLI_endian_switch.h" +#include "BLI_path_util.h" #include "BLI_string.h" #include "BLI_path_util.h" #include "BLI_fileops.h" #include "BLI_math_base.h" +#include "IMB_indexer.h" +#include "IMB_anim.h" +#include "AVI_avi.h" +#include "imbuf.h" + #include "MEM_guardedalloc.h" #include "DNA_userdef_types.h" #include "BKE_global.h" diff --git a/source/blender/imbuf/intern/indexer_dv.c b/source/blender/imbuf/intern/indexer_dv.c index 4c6b750aa41..6b960a18277 100644 --- a/source/blender/imbuf/intern/indexer_dv.c +++ b/source/blender/imbuf/intern/indexer_dv.c @@ -22,9 +22,12 @@ * ***** END GPL LICENSE BLOCK ***** */ -#include "IMB_indexer.h" #include "MEM_guardedalloc.h" + #include "BLI_utildefines.h" +#include "BLI_path_util.h" + +#include "IMB_indexer.h" #include typedef struct indexer_dv_bitstream { diff --git a/source/blender/imbuf/intern/thumbs.c b/source/blender/imbuf/intern/thumbs.c index 6a234b8e29a..2a2aedb49ff 100644 --- a/source/blender/imbuf/intern/thumbs.c +++ b/source/blender/imbuf/intern/thumbs.c @@ -39,8 +39,6 @@ #include "BLI_fileops.h" #include "BLI_md5.h" -#include "BKE_utildefines.h" - #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" #include "IMB_thumbs.h" diff --git a/source/blender/imbuf/intern/thumbs_blend.c b/source/blender/imbuf/intern/thumbs_blend.c index e387a133bfb..cfc49d8cef5 100644 --- a/source/blender/imbuf/intern/thumbs_blend.c +++ b/source/blender/imbuf/intern/thumbs_blend.c @@ -37,7 +37,6 @@ #include "BLO_blend_defs.h" -#include "BKE_utildefines.h" #include "BKE_global.h" #include "IMB_imbuf_types.h" -- cgit v1.2.3