[Bf-blender-cvs] [21fcc723e98] master: imbuf: revert some of the changes of rBb6ba3c682dd6615e760905572a5bcd69bb46371f since they broke the build.
Ray Molenkamp
noreply at git.blender.org
Sun Apr 1 23:17:30 CEST 2018
Commit: 21fcc723e98b81f77c46edb18c5092d8878c6ccb
Author: Ray Molenkamp
Date: Sun Apr 1 15:17:17 2018 -0600
Branches: master
https://developer.blender.org/rB21fcc723e98b81f77c46edb18c5092d8878c6ccb
imbuf: revert some of the changes of rBb6ba3c682dd6615e760905572a5bcd69bb46371f since they broke the build.
===================================================================
M source/blender/imbuf/intern/anim_movie.c
M source/blender/imbuf/intern/util.c
===================================================================
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"
More information about the Bf-blender-cvs
mailing list