Merge branch 'master' into blender2.8

2018-07-30 15:39:12 +10:00
parent 40ad0de002 9c960557a7
commit 5f693d7442
2 changed files with 5 additions and 1 deletions
--- a/source/blender/compositor/nodes/COM_CryptomatteNode.h
+++ b/source/blender/compositor/nodes/COM_CryptomatteNode.h
@@ -35,4 +35,3 @@ public:
 };

 #endif
-