diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-25 00:06:22 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-25 00:06:22 +0300 |
| commit | 13fa509187e0cc7e3b9df806dc2496b7516e2cd3 (patch) | |
| tree | e0ad92cb193d4af4d51fc2f1930806681b23f892 /source/blender/imbuf | |
| parent | 059c119719e04283808d3c7076886e1a58874f6b (diff) | |
| parent | b348d1ac6263052d235979b84c721b6b99420078 (diff) | |
Merge branch 'master' into blender2.8
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/cin_debug_stuff.h | 0 |
2 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/cineon/CMakeLists.txt b/source/blender/imbuf/intern/cineon/CMakeLists.txt index 0a3c440d9a7..f15839f5eb7 100644 --- a/source/blender/imbuf/intern/cineon/CMakeLists.txt +++ b/source/blender/imbuf/intern/cineon/CMakeLists.txt @@ -38,7 +38,6 @@ set(INC_SYS ) set(SRC - cin_debug_stuff.h cineonlib.h dpxlib.h logImageCore.h diff --git a/source/blender/imbuf/intern/cineon/cin_debug_stuff.h b/source/blender/imbuf/intern/cineon/cin_debug_stuff.h deleted file mode 100644 index e69de29bb2d..00000000000 --- a/source/blender/imbuf/intern/cineon/cin_debug_stuff.h +++ /dev/null |