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:
authorRay Molenkamp <github@lazydodo.com>2018-04-02 00:17:17 +0300
committerRay Molenkamp <github@lazydodo.com>2018-04-02 00:17:17 +0300
commit21fcc723e98b81f77c46edb18c5092d8878c6ccb (patch)
tree7584a201d8eba28f23b0e7ed32ecb025a9f5aa48 /source/blender/imbuf
parentb29ecbfc6bb578165277ce40e0a093a08006944e (diff)
imbuf: revert some of the changes of rBb6ba3c682dd6615e760905572a5bcd69bb46371f since they broke the build.
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r--source/blender/imbuf/intern/anim_movie.c2
-rw-r--r--source/blender/imbuf/intern/util.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c
index 979b7d9b814..74ec5e885e5 100644
--- a/source/blender/imbuf/intern/anim_movie.c
+++ b/source/blender/imbuf/intern/anim_movie.c
@@ -67,7 +67,7 @@
#include "BLI_path_util.h"
#include "MEM_guardedalloc.h"
-
+#include "BKE_global.h"
#ifdef WITH_AVI
# include "AVI_avi.h"
diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c
index 2b6963b9170..76a44aa81f7 100644
--- a/source/blender/imbuf/intern/util.c
+++ b/source/blender/imbuf/intern/util.c
@@ -43,6 +43,7 @@
#include "BLI_fileops.h"
#include "BLI_string.h"
+#include "BKE_global.h"
#include "imbuf.h"
#include "IMB_imbuf_types.h"