diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-30 08:39:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-30 08:39:12 +0300 |
| commit | 5f693d74420d4080f2395e75b36f57d87603bf9f (patch) | |
| tree | 038fbe6daae8a40d2a149fdaf56169f41e4f78a4 /source/blender/compositor | |
| parent | 40ad0de0027dd15934bec4fa79349c4580f83945 (diff) | |
| parent | 9c960557a7d2734b3be8cf5f512ef0d8bba54e98 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/compositor')
| -rw-r--r-- | source/blender/compositor/nodes/COM_CryptomatteNode.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/compositor/nodes/COM_CryptomatteNode.h b/source/blender/compositor/nodes/COM_CryptomatteNode.h index 5251b57d8af..0ee3c1740b3 100644 --- a/source/blender/compositor/nodes/COM_CryptomatteNode.h +++ b/source/blender/compositor/nodes/COM_CryptomatteNode.h @@ -35,4 +35,3 @@ public: }; #endif - |