diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-07-03 04:02:45 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-07-03 04:02:45 +0400 |
| commit | 98a7ca61fa905792bd3fdfa6c29f44691c9582ac (patch) | |
| tree | 47455f2482f6eca0352c10c57482641eec6afb57 /source/blender/compositor/nodes/COM_ChannelMatteNode.h | |
| parent | 4e39a854b4589cddff484649d95cce4c71d4e9f4 (diff) | |
| parent | 2ed69a95f499081aacc15c0295f3461c38430554 (diff) | |
Merged changes in the trunk up to revision 48505.
Diffstat (limited to 'source/blender/compositor/nodes/COM_ChannelMatteNode.h')
| -rw-r--r-- | source/blender/compositor/nodes/COM_ChannelMatteNode.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/compositor/nodes/COM_ChannelMatteNode.h b/source/blender/compositor/nodes/COM_ChannelMatteNode.h index 45d03e18a6a..4efb06c9f87 100644 --- a/source/blender/compositor/nodes/COM_ChannelMatteNode.h +++ b/source/blender/compositor/nodes/COM_ChannelMatteNode.h @@ -19,8 +19,8 @@ * Dalai Felinto */ -#ifndef COM_ChannelMatteNODE_H -#define COM_ChannelMatteNODE_H +#ifndef _COM_ChannelMatteNode_h_ +#define _COM_ChannelMatteNode_h_ #include "COM_Node.h" @@ -28,8 +28,7 @@ * @brief ChannelMatteNode * @ingroup Node */ -class ChannelMatteNode : public Node -{ +class ChannelMatteNode : public Node { public: ChannelMatteNode(bNode *editorNode); void convertToOperations(ExecutionSystem *graph, CompositorContext *context); |