diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-08-08 04:53:22 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-08 04:53:22 +0300 |
commit | e71470e3160ea37df46d4808c3c63d899a997205 (patch) | |
tree | c21d15b900ee5783bae6ce309c552396e436ce49 /source/blender/compositor/nodes/COM_CombineColorNode.h | |
parent | 441177b1c79f7ee8fb3764feb5a1ee1fc97ec263 (diff) | |
parent | f86c965d7f22b1a9b633ac3039e32327030822f3 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/compositor/nodes/COM_CombineColorNode.h')
-rw-r--r-- | source/blender/compositor/nodes/COM_CombineColorNode.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/compositor/nodes/COM_CombineColorNode.h b/source/blender/compositor/nodes/COM_CombineColorNode.h index d5439e0056c..030224e16f9 100644 --- a/source/blender/compositor/nodes/COM_CombineColorNode.h +++ b/source/blender/compositor/nodes/COM_CombineColorNode.h @@ -21,8 +21,8 @@ * Lukas Toenne */ -#ifndef _COM_CombineColorNode_h_ -#define _COM_CombineColorNode_h_ +#ifndef __COM_COMBINECOLORNODE_H__ +#define __COM_COMBINECOLORNODE_H__ #include "COM_Node.h" |