diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-02 15:19:44 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-02 15:19:44 +0300 |
| commit | b186592b211ef91c20cc771ed743ee21a09223be (patch) | |
| tree | 81f736969ae5e0d70bce223b1bd4b656d98e1151 /source/blender/imbuf | |
| parent | 44efbef41e789837d62bb7f4217f10b59016d11b (diff) | |
Cleanup: move BKE_global include under ifdef's
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/anim_movie.c | 3 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/util.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index 74ec5e885e5..cc8a38d5bf4 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -67,7 +67,6 @@ #include "BLI_path_util.h" #include "MEM_guardedalloc.h" -#include "BKE_global.h" #ifdef WITH_AVI # include "AVI_avi.h" @@ -83,6 +82,8 @@ #include "IMB_indexer.h" #ifdef WITH_FFMPEG +# include "BKE_global.h" /* ENDIAN_ORDER */ + # include <libavformat/avformat.h> # include <libavcodec/avcodec.h> # include <libavutil/rational.h> diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index 76a44aa81f7..9dfe926ddff 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -43,8 +43,6 @@ #include "BLI_fileops.h" #include "BLI_string.h" -#include "BKE_global.h" - #include "imbuf.h" #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" @@ -53,6 +51,7 @@ #include "IMB_anim.h" #ifdef WITH_FFMPEG +#include "BKE_global.h" /* G.debug */ #include <libavcodec/avcodec.h> #include <libavformat/avformat.h> #include <libavdevice/avdevice.h> |