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_ColorRampNode.h | |
parent | 4e39a854b4589cddff484649d95cce4c71d4e9f4 (diff) | |
parent | 2ed69a95f499081aacc15c0295f3461c38430554 (diff) |
Merged changes in the trunk up to revision 48505.
Diffstat (limited to 'source/blender/compositor/nodes/COM_ColorRampNode.h')
-rw-r--r-- | source/blender/compositor/nodes/COM_ColorRampNode.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/compositor/nodes/COM_ColorRampNode.h b/source/blender/compositor/nodes/COM_ColorRampNode.h index 4d706e126e1..6c256c09e68 100644 --- a/source/blender/compositor/nodes/COM_ColorRampNode.h +++ b/source/blender/compositor/nodes/COM_ColorRampNode.h @@ -20,8 +20,8 @@ * Monique Dewanchand */ -#ifndef COM_ColorRampNODE_H -#define COM_ColorRampNODE_H +#ifndef _COM_ColorRampNode_h_ +#define _COM_ColorRampNode_h_ #include "COM_Node.h" @@ -29,8 +29,7 @@ * @brief ColorRampNode * @ingroup Node */ -class ColorRampNode : public Node -{ +class ColorRampNode : public Node { public: ColorRampNode(bNode *editorNode); void convertToOperations(ExecutionSystem *graph, CompositorContext *context); |