diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 10:25:40 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 10:25:40 +0300 |
| commit | 18d87e79e92e0cb4792ba3cb42c4ea84fcd29d90 (patch) | |
| tree | b35fd8ad683c79a5cbd9f8419220ee1892cd9ef8 /source/blender/compositor/nodes | |
| parent | 332548753008f941d920c8a9ee1079dbf1895d37 (diff) | |
| parent | b3727668168075137f2ded11d7a7821548e4451d (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/compositor/nodes')
| -rw-r--r-- | source/blender/compositor/nodes/COM_CropNode.h | 2 | ||||
| -rw-r--r-- | source/blender/compositor/nodes/COM_ImageNode.cpp | 1 | ||||
| -rw-r--r-- | source/blender/compositor/nodes/COM_TranslateNode.cpp | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/source/blender/compositor/nodes/COM_CropNode.h b/source/blender/compositor/nodes/COM_CropNode.h index cdec70a4a5c..d33243b915a 100644 --- a/source/blender/compositor/nodes/COM_CropNode.h +++ b/source/blender/compositor/nodes/COM_CropNode.h @@ -36,5 +36,3 @@ public: }; #endif - - diff --git a/source/blender/compositor/nodes/COM_ImageNode.cpp b/source/blender/compositor/nodes/COM_ImageNode.cpp index 36e71aa1203..b82de5962e9 100644 --- a/source/blender/compositor/nodes/COM_ImageNode.cpp +++ b/source/blender/compositor/nodes/COM_ImageNode.cpp @@ -271,4 +271,3 @@ void ImageNode::convertToOperations(NodeConverter &converter, const CompositorCo } } } - diff --git a/source/blender/compositor/nodes/COM_TranslateNode.cpp b/source/blender/compositor/nodes/COM_TranslateNode.cpp index ac09b38951b..78d1bfc3b28 100644 --- a/source/blender/compositor/nodes/COM_TranslateNode.cpp +++ b/source/blender/compositor/nodes/COM_TranslateNode.cpp @@ -71,4 +71,3 @@ void TranslateNode::convertToOperations(NodeConverter &converter, const Composit converter.mapInputSocket(inputSocket, operation->getInputSocket(0)); } } - |