diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-05-28 23:35:26 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-28 23:35:26 +0400 |
| commit | 225c5fee6b046b9829643f82cf6cbce159e4e007 (patch) | |
| tree | 4092b2c57ba33a616dd0a837b050d0c79f9bcc84 /source/blender/quicktime | |
| parent | 60befcdc6297281ce226273123d3ccfc0a681aff (diff) | |
move BLO_sys_types.h -> BLI_sys_types.h (it had nothing todo with loading)
remove MEM_sys_types.h which was a duplicate.
Diffstat (limited to 'source/blender/quicktime')
| -rw-r--r-- | source/blender/quicktime/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blender/quicktime/SConscript | 1 | ||||
| -rw-r--r-- | source/blender/quicktime/apple/qtkit_export.m | 2 | ||||
| -rw-r--r-- | source/blender/quicktime/apple/qtkit_import.m | 2 | ||||
| -rw-r--r-- | source/blender/quicktime/apple/quicktime_export.c | 2 | ||||
| -rw-r--r-- | source/blender/quicktime/apple/quicktime_import.c | 2 |
6 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/quicktime/CMakeLists.txt b/source/blender/quicktime/CMakeLists.txt index e8f8fa51a0a..0c5c4d8a9f1 100644 --- a/source/blender/quicktime/CMakeLists.txt +++ b/source/blender/quicktime/CMakeLists.txt @@ -28,7 +28,6 @@ set(INC ../avi ../blenkernel ../blenlib - ../blenloader ../imbuf ../imbuf/intern ../makesdna diff --git a/source/blender/quicktime/SConscript b/source/blender/quicktime/SConscript index a32f325de24..a6debf06226 100644 --- a/source/blender/quicktime/SConscript +++ b/source/blender/quicktime/SConscript @@ -47,7 +47,6 @@ incs = ['.', '../avi', '../imbuf', '../imbuf/intern', - '../blenloader', '../render/extern/include', '../editors/include', '#/intern/audaspace/intern'] diff --git a/source/blender/quicktime/apple/qtkit_export.m b/source/blender/quicktime/apple/qtkit_export.m index 1aff682eef8..7b42c89d936 100644 --- a/source/blender/quicktime/apple/qtkit_export.m +++ b/source/blender/quicktime/apple/qtkit_export.m @@ -46,7 +46,7 @@ #include "BLI_blenlib.h" -#include "BLO_sys_types.h" +#include "BLI_sys_types.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/quicktime/apple/qtkit_import.m b/source/blender/quicktime/apple/qtkit_import.m index 2706895571f..bee26c5348e 100644 --- a/source/blender/quicktime/apple/qtkit_import.m +++ b/source/blender/quicktime/apple/qtkit_import.m @@ -29,7 +29,7 @@ #include "MEM_guardedalloc.h" #include "IMB_anim.h" -#include "BLO_sys_types.h" +#include "BLI_sys_types.h" #include "BLI_utildefines.h" #include "BKE_global.h" diff --git a/source/blender/quicktime/apple/quicktime_export.c b/source/blender/quicktime/apple/quicktime_export.c index 5e114bf7379..ce4f3063082 100644 --- a/source/blender/quicktime/apple/quicktime_export.c +++ b/source/blender/quicktime/apple/quicktime_export.c @@ -47,7 +47,7 @@ #include "BLI_blenlib.h" -#include "BLO_sys_types.h" +#include "BLI_sys_types.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/quicktime/apple/quicktime_import.c b/source/blender/quicktime/apple/quicktime_import.c index 7fb14e5da09..511b62d856a 100644 --- a/source/blender/quicktime/apple/quicktime_import.c +++ b/source/blender/quicktime/apple/quicktime_import.c @@ -36,7 +36,7 @@ #include "MEM_guardedalloc.h" #include "IMB_anim.h" -#include "BLO_sys_types.h" +#include "BLI_sys_types.h" #include "BKE_global.h" #include "BLI_dynstr.h" #include "BLI_path_util.h" |