[Bf-blender-cvs] [c7f2edf] ui-preview-buttons: move icon defines out of BLI_utildefines.h

[Campbell Barton]

Commit: c7f2edf508fd02ed3aa071a8e61d5ed72f272391
Author: Campbell Barton
Date:   Mon May 11 14:12:59 2015 +1000
Branches: ui-preview-buttons
https://developer.blender.org/rBc7f2edf508fd02ed3aa071a8e61d5ed72f272391

move icon defines out of BLI_utildefines.h

===================================================================

M	source/blender/blenkernel/BKE_icons.h
M	source/blender/blenlib/BLI_utildefines.h
M	source/blender/editors/interface/interface_icons.c
M	source/blender/imbuf/IMB_thumbs.h

===================================================================

diff --git a/source/blender/blenkernel/BKE_icons.h b/source/blender/blenkernel/BKE_icons.h
index 7459732..763a387 100644
--- a/source/blender/blenkernel/BKE_icons.h
+++ b/source/blender/blenkernel/BKE_icons.h
@@ -113,5 +113,6 @@ struct PreviewImage *BKE_previewimg_cached_thumbnail_read(
 
 void BKE_previewimg_cached_release(const char *name);
 
+#define ICON_RENDER_DEFAULT_HEIGHT 32
 
 #endif /*  __BKE_ICONS_H__ */
diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h
index dbfd820..8f2f906 100644
--- a/source/blender/blenlib/BLI_utildefines.h
+++ b/source/blender/blenlib/BLI_utildefines.h
@@ -684,11 +684,6 @@ extern void BLI_system_backtrace(FILE *fp);
 #  define UNLIKELY(x)     (x)
 #endif
 
-/* XXX Find a better place for that? DNA?
- *     Thing is, we need those defines in IMB, BKE, editors... */
-#define ICON_RENDER_DEFAULT_HEIGHT 32
-#define PREVIEW_RENDER_DEFAULT_HEIGHT 128
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index afd3f57..7c05d5f 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -55,6 +55,7 @@
 
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
+#include "IMB_thumbs.h"
 
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
diff --git a/source/blender/imbuf/IMB_thumbs.h b/source/blender/imbuf/IMB_thumbs.h
index f977a63..2cb5683 100644
--- a/source/blender/imbuf/IMB_thumbs.h
+++ b/source/blender/imbuf/IMB_thumbs.h
@@ -61,6 +61,8 @@ typedef enum ThumbSource {
 /* don't generate thumbs for images bigger then this (100mb) */
 #define THUMB_SIZE_MAX (100 * 1024 * 1024)
 
+#define PREVIEW_RENDER_DEFAULT_HEIGHT 128
+
 /* create thumbnail for file and returns new imbuf for thumbnail */
 ImBuf *IMB_thumb_create(const char *path, ThumbSize size, ThumbSource source, ImBuf *ibuf);