diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-28 18:19:53 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-28 18:19:53 +0400 |
| commit | 420150f75224a9f0fc8d46e4f23dae5e4f0ad623 (patch) | |
| tree | 9d1a12c598b6722648bdb7901d230546e2b1d23b /source/blender/compositor/operations | |
| parent | 6b345811b7f9d271673cb97597bfbefc42d2327b (diff) | |
| parent | 1ba5db129b27cec4cf7c9ceca549e1dd0746d001 (diff) | |
svn merge ^/trunk/blender -r48370:48375
Diffstat (limited to 'source/blender/compositor/operations')
| -rw-r--r-- | source/blender/compositor/operations/COM_BlurBaseOperation.cpp | 3 | ||||
| -rw-r--r-- | source/blender/compositor/operations/COM_ChannelMatteOperation.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/compositor/operations/COM_BlurBaseOperation.cpp b/source/blender/compositor/operations/COM_BlurBaseOperation.cpp index d1ddecc0df6..696c0748d69 100644 --- a/source/blender/compositor/operations/COM_BlurBaseOperation.cpp +++ b/source/blender/compositor/operations/COM_BlurBaseOperation.cpp @@ -27,8 +27,9 @@ extern "C" { #include "RE_pipeline.h" } -BlurBaseOperation::BlurBaseOperation(DataType data_type=COM_DT_COLOR) : NodeOperation() +BlurBaseOperation::BlurBaseOperation(DataType data_type) : NodeOperation() { + /* data_type is almost always COM_DT_COLOR except for alpha-blur */ this->addInputSocket(data_type); this->addInputSocket(COM_DT_VALUE); this->addOutputSocket(data_type); diff --git a/source/blender/compositor/operations/COM_ChannelMatteOperation.h b/source/blender/compositor/operations/COM_ChannelMatteOperation.h index 859df200020..5bc13736dda 100644 --- a/source/blender/compositor/operations/COM_ChannelMatteOperation.h +++ b/source/blender/compositor/operations/COM_ChannelMatteOperation.h @@ -32,7 +32,7 @@ class ChannelMatteOperation : public NodeOperation { private: SocketReader *m_inputImageProgram; - int m_color_space; /* node->custom1 */ + /* int m_color_space; */ /* node->custom1 */ /* UNUSED */ /* TODO ? */ int m_matte_channel; /* node->custom2 */ int m_limit_method; /* node->algorithm */ int m_limit_channel; /* node->channel */ |