Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-09-04 02:04:14 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-09-04 02:04:14 +0400
commitaaafa0c2fe2fefacd454e7c4ca30122be2206923 (patch)
treeed0caa3e89f884df46929197cc2c2f38329e95aa /source/blender/imbuf/intern
parentf8c29c999f0f0a6ed7e8a8ba1de444fdc5bdd3f2 (diff)
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.
Diffstat (limited to 'source/blender/imbuf/intern')
-rw-r--r--source/blender/imbuf/intern/IMB_indexer.h1
-rw-r--r--source/blender/imbuf/intern/indexer.c10
-rw-r--r--source/blender/imbuf/intern/indexer_dv.c5
-rw-r--r--source/blender/imbuf/intern/thumbs.c2
-rw-r--r--source/blender/imbuf/intern/thumbs_blend.c1
5 files changed, 10 insertions, 9 deletions
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 <stdlib.h>
#include <stdio.h>
-#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 <stdlib.h>
-#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 <time.h>
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"