Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 24 Nov 2018 21:06:22 +0000 (08:06 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 24 Nov 2018 21:06:22 +0000 (08:06 +1100)
source/blender/imbuf/intern/cineon/CMakeLists.txt
source/blender/imbuf/intern/cineon/cin_debug_stuff.h [deleted file]

index 0a3c440d9a7dc470e06247386385392963af1b08..f15839f5eb7b6af102bedc8264403ecb5a2ef3e4 100644 (file)
@@ -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 (file)
index e69de29..0000000