Merge branch 'master' into blender2.8

2018-11-25 08:06:22 +11:00
parent 059c119719 b348d1ac62
commit 13fa509187
2 changed files with 0 additions and 1 deletions
--- 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
--- a/source/blender/imbuf/intern/cineon/cin_debug_stuff.h
+++ b/source/blender/imbuf/intern/cineon/cin_debug_stuff.h