diff options
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/cineon/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/cineon/SConscript | 1 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/cineon/logImageCore.h | 2 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/dds/FlipDXT.h | 2 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/scaling.c | 2 |
5 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/imbuf/intern/cineon/CMakeLists.txt b/source/blender/imbuf/intern/cineon/CMakeLists.txt index b94cfd22058..0028cdb4701 100644 --- a/source/blender/imbuf/intern/cineon/CMakeLists.txt +++ b/source/blender/imbuf/intern/cineon/CMakeLists.txt @@ -29,7 +29,6 @@ set(INC ../.. ../../../blenkernel ../../../blenlib - ../../../blenloader ../../../makesdna ../../../../../intern/guardedalloc ) diff --git a/source/blender/imbuf/intern/cineon/SConscript b/source/blender/imbuf/intern/cineon/SConscript index d8fc2502081..037a7fec1bc 100644 --- a/source/blender/imbuf/intern/cineon/SConscript +++ b/source/blender/imbuf/intern/cineon/SConscript @@ -31,7 +31,6 @@ source_files = env.Glob('*.c') incs = ['.', '../../../blenkernel', - '../../../blenloader', '../../', '..', '../../../blenlib', diff --git a/source/blender/imbuf/intern/cineon/logImageCore.h b/source/blender/imbuf/intern/cineon/logImageCore.h index 7c75f8b730b..6b1435817d2 100644 --- a/source/blender/imbuf/intern/cineon/logImageCore.h +++ b/source/blender/imbuf/intern/cineon/logImageCore.h @@ -35,7 +35,7 @@ #include <stdio.h> -#include "BLO_sys_types.h" +#include "BLI_sys_types.h" #include "BLI_utildefines.h" #ifdef __cplusplus diff --git a/source/blender/imbuf/intern/dds/FlipDXT.h b/source/blender/imbuf/intern/dds/FlipDXT.h index 8d0ae8139a1..892c49bc5d2 100644 --- a/source/blender/imbuf/intern/dds/FlipDXT.h +++ b/source/blender/imbuf/intern/dds/FlipDXT.h @@ -23,7 +23,7 @@ #ifndef __FLIPDXT_H__ #define __FLIPDXT_H__ -#include "MEM_sys_types.h" +#include "BLI_sys_types.h" /* flip compressed DXT image vertically to fit OpenGL convention */ int FlipDXTCImage(unsigned int width, unsigned int height, unsigned int levels, int fourcc, uint8_t *data); diff --git a/source/blender/imbuf/intern/scaling.c b/source/blender/imbuf/intern/scaling.c index 553a530ecf4..2ae05315c85 100644 --- a/source/blender/imbuf/intern/scaling.c +++ b/source/blender/imbuf/intern/scaling.c @@ -44,7 +44,7 @@ #include "IMB_allocimbuf.h" #include "IMB_filter.h" -#include "BLO_sys_types.h" // for intptr_t support +#include "BLI_sys_types.h" // for intptr_t support /************************************************************************/ /* SCALING */ |