From 91694b9b58ab953f3b313be9389cc1303e472fc2 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Fri, 7 Aug 2020 09:50:34 +0200 Subject: Code Style: use "#pragma once" in source directory This replaces header include guards with `#pragma once`. A couple of include guards are not removed yet (e.g. `__RNA_TYPES_H__`), because they are used in other places. This patch has been generated by P1561 followed by `make format`. Differential Revision: https://developer.blender.org/D8466 --- source/blender/compositor/COM_compositor.h | 4 +--- source/blender/compositor/COM_defines.h | 5 +---- source/blender/compositor/intern/COM_CPUDevice.h | 5 +---- source/blender/compositor/intern/COM_ChunkOrder.h | 5 +---- source/blender/compositor/intern/COM_ChunkOrderHotspot.h | 5 +---- source/blender/compositor/intern/COM_CompositorContext.h | 5 +---- source/blender/compositor/intern/COM_Converter.h | 4 +--- source/blender/compositor/intern/COM_Debug.h | 5 +---- source/blender/compositor/intern/COM_Device.h | 5 +---- source/blender/compositor/intern/COM_ExecutionGroup.h | 5 +---- source/blender/compositor/intern/COM_ExecutionSystem.h | 5 +---- source/blender/compositor/intern/COM_MemoryBuffer.h | 5 +---- source/blender/compositor/intern/COM_MemoryProxy.h | 6 ++---- source/blender/compositor/intern/COM_Node.h | 5 +---- source/blender/compositor/intern/COM_NodeConverter.h | 5 +---- source/blender/compositor/intern/COM_NodeGraph.h | 5 +---- source/blender/compositor/intern/COM_NodeOperation.h | 5 +---- source/blender/compositor/intern/COM_NodeOperationBuilder.h | 5 +---- source/blender/compositor/intern/COM_OpenCLDevice.h | 5 +---- source/blender/compositor/intern/COM_SingleThreadedOperation.h | 5 ++--- source/blender/compositor/intern/COM_SocketReader.h | 6 ++---- source/blender/compositor/intern/COM_WorkPackage.h | 6 ++---- source/blender/compositor/intern/COM_WorkScheduler.h | 5 +---- source/blender/compositor/nodes/COM_AlphaOverNode.h | 5 +---- source/blender/compositor/nodes/COM_BilateralBlurNode.h | 5 +---- source/blender/compositor/nodes/COM_BlurNode.h | 5 +---- source/blender/compositor/nodes/COM_BokehBlurNode.h | 5 +---- source/blender/compositor/nodes/COM_BokehImageNode.h | 5 +---- source/blender/compositor/nodes/COM_BoxMaskNode.h | 5 +---- source/blender/compositor/nodes/COM_BrightnessNode.h | 5 +---- source/blender/compositor/nodes/COM_ChannelMatteNode.h | 5 +---- source/blender/compositor/nodes/COM_ChromaMatteNode.h | 5 +---- source/blender/compositor/nodes/COM_ColorBalanceNode.h | 5 +---- source/blender/compositor/nodes/COM_ColorCorrectionNode.h | 5 +---- source/blender/compositor/nodes/COM_ColorCurveNode.h | 5 +---- source/blender/compositor/nodes/COM_ColorMatteNode.h | 5 +---- source/blender/compositor/nodes/COM_ColorNode.h | 5 +---- source/blender/compositor/nodes/COM_ColorRampNode.h | 5 +---- source/blender/compositor/nodes/COM_ColorSpillNode.h | 5 +---- source/blender/compositor/nodes/COM_ColorToBWNode.h | 4 +--- source/blender/compositor/nodes/COM_CombineColorNode.h | 5 +---- source/blender/compositor/nodes/COM_CompositorNode.h | 4 +--- source/blender/compositor/nodes/COM_ConvertAlphaNode.h | 5 +---- source/blender/compositor/nodes/COM_CornerPinNode.h | 5 +---- source/blender/compositor/nodes/COM_CropNode.h | 5 +---- source/blender/compositor/nodes/COM_CryptomatteNode.h | 5 +---- source/blender/compositor/nodes/COM_DefocusNode.h | 5 +---- source/blender/compositor/nodes/COM_DenoiseNode.h | 5 +---- source/blender/compositor/nodes/COM_DespeckleNode.h | 5 +---- source/blender/compositor/nodes/COM_DifferenceMatteNode.h | 5 +---- source/blender/compositor/nodes/COM_DilateErodeNode.h | 5 +---- source/blender/compositor/nodes/COM_DirectionalBlurNode.h | 5 +---- source/blender/compositor/nodes/COM_DisplaceNode.h | 4 +--- source/blender/compositor/nodes/COM_DistanceMatteNode.h | 5 +---- source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.h | 5 +---- source/blender/compositor/nodes/COM_EllipseMaskNode.h | 5 +---- source/blender/compositor/nodes/COM_FilterNode.h | 5 +---- source/blender/compositor/nodes/COM_FlipNode.h | 5 +---- source/blender/compositor/nodes/COM_GammaNode.h | 5 +---- source/blender/compositor/nodes/COM_GlareNode.h | 5 +---- source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.h | 4 +--- source/blender/compositor/nodes/COM_HueSaturationValueNode.h | 4 +--- source/blender/compositor/nodes/COM_IDMaskNode.h | 5 +---- source/blender/compositor/nodes/COM_ImageNode.h | 5 +---- source/blender/compositor/nodes/COM_InpaintNode.h | 5 +---- source/blender/compositor/nodes/COM_InvertNode.h | 5 +---- source/blender/compositor/nodes/COM_KeyingNode.h | 5 +---- source/blender/compositor/nodes/COM_KeyingScreenNode.h | 5 +---- source/blender/compositor/nodes/COM_LensDistortionNode.h | 5 +---- source/blender/compositor/nodes/COM_LuminanceMatteNode.h | 5 +---- source/blender/compositor/nodes/COM_MapRangeNode.h | 5 +---- source/blender/compositor/nodes/COM_MapUVNode.h | 4 +--- source/blender/compositor/nodes/COM_MapValueNode.h | 5 +---- source/blender/compositor/nodes/COM_MaskNode.h | 5 +---- source/blender/compositor/nodes/COM_MathNode.h | 5 +---- source/blender/compositor/nodes/COM_MixNode.h | 4 +--- source/blender/compositor/nodes/COM_MovieClipNode.h | 5 +---- source/blender/compositor/nodes/COM_MovieDistortionNode.h | 5 +---- source/blender/compositor/nodes/COM_NormalNode.h | 5 +---- source/blender/compositor/nodes/COM_NormalizeNode.h | 5 +---- source/blender/compositor/nodes/COM_OutputFileNode.h | 5 +---- source/blender/compositor/nodes/COM_PixelateNode.h | 5 +---- source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h | 5 +---- source/blender/compositor/nodes/COM_RenderLayersNode.h | 5 +---- source/blender/compositor/nodes/COM_RotateNode.h | 5 +---- source/blender/compositor/nodes/COM_ScaleNode.h | 5 +---- source/blender/compositor/nodes/COM_SeparateColorNode.h | 5 +---- source/blender/compositor/nodes/COM_SetAlphaNode.h | 5 +---- source/blender/compositor/nodes/COM_SocketProxyNode.h | 5 +---- source/blender/compositor/nodes/COM_SplitViewerNode.h | 4 +--- source/blender/compositor/nodes/COM_Stabilize2dNode.h | 5 +---- source/blender/compositor/nodes/COM_SunBeamsNode.h | 5 +---- source/blender/compositor/nodes/COM_SwitchNode.h | 4 +--- source/blender/compositor/nodes/COM_SwitchViewNode.h | 4 +--- source/blender/compositor/nodes/COM_TextureNode.h | 5 +---- source/blender/compositor/nodes/COM_TimeNode.h | 5 +---- source/blender/compositor/nodes/COM_TonemapNode.h | 5 +---- source/blender/compositor/nodes/COM_TrackPositionNode.h | 5 +---- source/blender/compositor/nodes/COM_TransformNode.h | 5 +---- source/blender/compositor/nodes/COM_TranslateNode.h | 5 +---- source/blender/compositor/nodes/COM_ValueNode.h | 5 +---- source/blender/compositor/nodes/COM_VectorBlurNode.h | 5 +---- source/blender/compositor/nodes/COM_VectorCurveNode.h | 5 +---- source/blender/compositor/nodes/COM_ViewLevelsNode.h | 5 +---- source/blender/compositor/nodes/COM_ViewerNode.h | 4 +--- source/blender/compositor/nodes/COM_ZCombineNode.h | 5 +---- source/blender/compositor/operations/COM_AlphaOverKeyOperation.h | 5 ++--- source/blender/compositor/operations/COM_AlphaOverMixedOperation.h | 5 ++--- .../compositor/operations/COM_AlphaOverPremultiplyOperation.h | 5 ++--- source/blender/compositor/operations/COM_AntiAliasOperation.h | 5 ++--- source/blender/compositor/operations/COM_BilateralBlurOperation.h | 5 ++--- source/blender/compositor/operations/COM_BlurBaseOperation.h | 5 ++--- source/blender/compositor/operations/COM_BokehBlurOperation.h | 4 +--- source/blender/compositor/operations/COM_BokehImageOperation.h | 5 ++--- source/blender/compositor/operations/COM_BoxMaskOperation.h | 5 ++--- source/blender/compositor/operations/COM_BrightnessOperation.h | 5 ++--- source/blender/compositor/operations/COM_CalculateMeanOperation.h | 5 ++--- .../compositor/operations/COM_CalculateStandardDeviationOperation.h | 5 ++--- source/blender/compositor/operations/COM_ChangeHSVOperation.h | 5 ++--- source/blender/compositor/operations/COM_ChannelMatteOperation.h | 5 ++--- source/blender/compositor/operations/COM_ChromaMatteOperation.h | 5 ++--- .../blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h | 5 ++--- source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h | 5 ++--- source/blender/compositor/operations/COM_ColorCorrectionOperation.h | 5 ++--- source/blender/compositor/operations/COM_ColorCurveOperation.h | 6 ++---- source/blender/compositor/operations/COM_ColorMatteOperation.h | 5 ++--- source/blender/compositor/operations/COM_ColorRampOperation.h | 5 ++--- source/blender/compositor/operations/COM_ColorSpillOperation.h | 6 ++---- source/blender/compositor/operations/COM_CompositorOperation.h | 5 ++--- .../compositor/operations/COM_ConvertColorProfileOperation.h | 5 ++--- .../compositor/operations/COM_ConvertDepthToRadiusOperation.h | 5 ++--- source/blender/compositor/operations/COM_ConvertOperation.h | 5 +---- .../compositor/operations/COM_ConvolutionEdgeFilterOperation.h | 5 +---- .../blender/compositor/operations/COM_ConvolutionFilterOperation.h | 5 +---- source/blender/compositor/operations/COM_CropOperation.h | 4 +--- source/blender/compositor/operations/COM_CryptomatteOperation.h | 5 ++--- source/blender/compositor/operations/COM_CurveBaseOperation.h | 5 ++--- source/blender/compositor/operations/COM_DenoiseOperation.h | 5 +---- source/blender/compositor/operations/COM_DespeckleOperation.h | 6 ++---- source/blender/compositor/operations/COM_DifferenceMatteOperation.h | 5 ++--- source/blender/compositor/operations/COM_DilateErodeOperation.h | 6 ++---- source/blender/compositor/operations/COM_DirectionalBlurOperation.h | 5 ++--- source/blender/compositor/operations/COM_DisplaceOperation.h | 5 ++--- source/blender/compositor/operations/COM_DisplaceSimpleOperation.h | 5 ++--- .../blender/compositor/operations/COM_DistanceRGBMatteOperation.h | 5 ++--- .../blender/compositor/operations/COM_DistanceYCCMatteOperation.h | 5 ++--- source/blender/compositor/operations/COM_DotproductOperation.h | 5 +---- source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h | 5 ++--- source/blender/compositor/operations/COM_EllipseMaskOperation.h | 5 ++--- .../blender/compositor/operations/COM_FastGaussianBlurOperation.h | 5 +---- source/blender/compositor/operations/COM_FlipOperation.h | 5 +---- source/blender/compositor/operations/COM_GammaCorrectOperation.h | 6 ++---- source/blender/compositor/operations/COM_GammaOperation.h | 5 ++--- .../blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h | 5 ++--- .../blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h | 5 ++--- .../blender/compositor/operations/COM_GaussianBokehBlurOperation.h | 6 ++---- source/blender/compositor/operations/COM_GaussianXBlurOperation.h | 5 ++--- source/blender/compositor/operations/COM_GaussianYBlurOperation.h | 5 ++--- source/blender/compositor/operations/COM_GlareBaseOperation.h | 4 +--- source/blender/compositor/operations/COM_GlareFogGlowOperation.h | 5 ++--- source/blender/compositor/operations/COM_GlareGhostOperation.h | 5 ++--- source/blender/compositor/operations/COM_GlareSimpleStarOperation.h | 5 ++--- source/blender/compositor/operations/COM_GlareStreaksOperation.h | 5 ++--- source/blender/compositor/operations/COM_GlareThresholdOperation.h | 5 ++--- .../compositor/operations/COM_HueSaturationValueCorrectOperation.h | 5 ++--- source/blender/compositor/operations/COM_IDMaskOperation.h | 5 ++--- source/blender/compositor/operations/COM_ImageOperation.h | 4 +--- source/blender/compositor/operations/COM_InpaintOperation.h | 6 ++---- source/blender/compositor/operations/COM_InvertOperation.h | 5 ++--- source/blender/compositor/operations/COM_KeyingBlurOperation.h | 5 +---- source/blender/compositor/operations/COM_KeyingClipOperation.h | 5 +---- source/blender/compositor/operations/COM_KeyingDespillOperation.h | 5 +---- source/blender/compositor/operations/COM_KeyingOperation.h | 5 +---- source/blender/compositor/operations/COM_KeyingScreenOperation.h | 5 +---- source/blender/compositor/operations/COM_LuminanceMatteOperation.h | 5 ++--- source/blender/compositor/operations/COM_MapRangeOperation.h | 5 ++--- source/blender/compositor/operations/COM_MapUVOperation.h | 6 ++---- source/blender/compositor/operations/COM_MapValueOperation.h | 5 ++--- source/blender/compositor/operations/COM_MaskOperation.h | 5 +---- source/blender/compositor/operations/COM_MathBaseOperation.h | 5 ++--- source/blender/compositor/operations/COM_MixOperation.h | 6 ++---- .../blender/compositor/operations/COM_MovieClipAttributeOperation.h | 5 ++--- source/blender/compositor/operations/COM_MovieClipOperation.h | 5 +---- source/blender/compositor/operations/COM_MovieDistortionOperation.h | 5 +---- source/blender/compositor/operations/COM_MultilayerImageOperation.h | 5 +---- source/blender/compositor/operations/COM_NormalizeOperation.h | 6 ++---- .../compositor/operations/COM_OutputFileMultiViewOperation.h | 6 ++---- source/blender/compositor/operations/COM_OutputFileOperation.h | 6 ++---- source/blender/compositor/operations/COM_PixelateOperation.h | 5 +---- source/blender/compositor/operations/COM_PlaneCornerPinOperation.h | 5 +---- .../blender/compositor/operations/COM_PlaneDistortCommonOperation.h | 5 +---- source/blender/compositor/operations/COM_PlaneTrackOperation.h | 5 +---- source/blender/compositor/operations/COM_PreviewOperation.h | 5 ++--- .../compositor/operations/COM_ProjectorLensDistortionOperation.h | 5 ++--- source/blender/compositor/operations/COM_QualityStepHelper.h | 5 ++--- source/blender/compositor/operations/COM_ReadBufferOperation.h | 5 +---- source/blender/compositor/operations/COM_RenderLayersProg.h | 5 +---- source/blender/compositor/operations/COM_RotateOperation.h | 5 +---- source/blender/compositor/operations/COM_ScaleOperation.h | 5 +---- .../compositor/operations/COM_ScreenLensDistortionOperation.h | 5 ++--- source/blender/compositor/operations/COM_SetAlphaOperation.h | 5 ++--- source/blender/compositor/operations/COM_SetColorOperation.h | 5 ++--- source/blender/compositor/operations/COM_SetSamplerOperation.h | 5 ++--- source/blender/compositor/operations/COM_SetValueOperation.h | 5 ++--- source/blender/compositor/operations/COM_SetVectorOperation.h | 5 ++--- source/blender/compositor/operations/COM_SocketProxyOperation.h | 5 +---- source/blender/compositor/operations/COM_SplitOperation.h | 5 ++--- source/blender/compositor/operations/COM_SunBeamsOperation.h | 5 +---- source/blender/compositor/operations/COM_TextureOperation.h | 5 +---- source/blender/compositor/operations/COM_TonemapOperation.h | 6 ++---- source/blender/compositor/operations/COM_TrackPositionOperation.h | 5 +---- source/blender/compositor/operations/COM_TranslateOperation.h | 5 +---- .../compositor/operations/COM_VariableSizeBokehBlurOperation.h | 5 ++--- source/blender/compositor/operations/COM_VectorBlurOperation.h | 5 ++--- source/blender/compositor/operations/COM_VectorCurveOperation.h | 5 ++--- source/blender/compositor/operations/COM_ViewerOperation.h | 5 ++--- source/blender/compositor/operations/COM_WrapOperation.h | 5 +---- source/blender/compositor/operations/COM_WriteBufferOperation.h | 4 +--- source/blender/compositor/operations/COM_ZCombineOperation.h | 6 ++---- 219 files changed, 301 insertions(+), 793 deletions(-) (limited to 'source/blender/compositor') diff --git a/source/blender/compositor/COM_compositor.h b/source/blender/compositor/COM_compositor.h index a24904551c6..b200fa8d266 100644 --- a/source/blender/compositor/COM_compositor.h +++ b/source/blender/compositor/COM_compositor.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_COMPOSITOR_H__ -#define __COM_COMPOSITOR_H__ +#pragma once #include "DNA_color_types.h" #include "DNA_node_types.h" @@ -364,4 +363,3 @@ void COM_deinitialize(void); } #endif -#endif /* __COM_COMPOSITOR_H__ */ diff --git a/source/blender/compositor/COM_defines.h b/source/blender/compositor/COM_defines.h index 3707845ef9b..a42719aaf09 100644 --- a/source/blender/compositor/COM_defines.h +++ b/source/blender/compositor/COM_defines.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_DEFINES_H__ -#define __COM_DEFINES_H__ +#pragma once /** * \brief possible data types for sockets @@ -108,5 +107,3 @@ typedef enum OrderOfChunks { #define COM_NUM_CHANNELS_COLOR 4 #define COM_BLUR_BOKEH_PIXELS 512 - -#endif /* __COM_DEFINES_H__ */ diff --git a/source/blender/compositor/intern/COM_CPUDevice.h b/source/blender/compositor/intern/COM_CPUDevice.h index 1d411569146..962380d7bc8 100644 --- a/source/blender/compositor/intern/COM_CPUDevice.h +++ b/source/blender/compositor/intern/COM_CPUDevice.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_CPUDEVICE_H__ -#define __COM_CPUDEVICE_H__ +#pragma once #include "COM_Device.h" @@ -44,5 +43,3 @@ class CPUDevice : public Device { protected: int m_thread_id; }; - -#endif diff --git a/source/blender/compositor/intern/COM_ChunkOrder.h b/source/blender/compositor/intern/COM_ChunkOrder.h index e75c07136b4..32d8c07de83 100644 --- a/source/blender/compositor/intern/COM_ChunkOrder.h +++ b/source/blender/compositor/intern/COM_ChunkOrder.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_CHUNKORDER_H__ -#define __COM_CHUNKORDER_H__ +#pragma once #include "COM_ChunkOrderHotspot.h" class ChunkOrder { @@ -53,5 +52,3 @@ class ChunkOrder { return this->m_distance; } }; - -#endif diff --git a/source/blender/compositor/intern/COM_ChunkOrderHotspot.h b/source/blender/compositor/intern/COM_ChunkOrderHotspot.h index f0bc92ad6d6..afacf5fc672 100644 --- a/source/blender/compositor/intern/COM_ChunkOrderHotspot.h +++ b/source/blender/compositor/intern/COM_ChunkOrderHotspot.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_CHUNKORDERHOTSPOT_H__ -#define __COM_CHUNKORDERHOTSPOT_H__ +#pragma once #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" @@ -37,5 +36,3 @@ class ChunkOrderHotspot { MEM_CXX_CLASS_ALLOC_FUNCS("COM:ChunkOrderHotspot") #endif }; - -#endif diff --git a/source/blender/compositor/intern/COM_CompositorContext.h b/source/blender/compositor/intern/COM_CompositorContext.h index 7e775b7beaf..e29a8f67187 100644 --- a/source/blender/compositor/intern/COM_CompositorContext.h +++ b/source/blender/compositor/intern/COM_CompositorContext.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_COMPOSITORCONTEXT_H__ -#define __COM_COMPOSITORCONTEXT_H__ +#pragma once #include "BLI_rect.h" #include "COM_defines.h" @@ -269,5 +268,3 @@ class CompositorContext { return (this->getbNodeTree()->flag & NTREE_COM_GROUPNODE_BUFFER) != 0; } }; - -#endif diff --git a/source/blender/compositor/intern/COM_Converter.h b/source/blender/compositor/intern/COM_Converter.h index 1213246b9c9..fe3b8b75ccc 100644 --- a/source/blender/compositor/intern/COM_Converter.h +++ b/source/blender/compositor/intern/COM_Converter.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_CONVERTER_H__ -#define __COM_CONVERTER_H__ +#pragma once #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" @@ -85,4 +84,3 @@ class Converter { MEM_CXX_CLASS_ALLOC_FUNCS("COM:Converter") #endif }; -#endif diff --git a/source/blender/compositor/intern/COM_Debug.h b/source/blender/compositor/intern/COM_Debug.h index 250f360fa35..35e44506ef2 100644 --- a/source/blender/compositor/intern/COM_Debug.h +++ b/source/blender/compositor/intern/COM_Debug.h @@ -16,8 +16,7 @@ * Copyright 2013, Blender Foundation. */ -#ifndef __COM_DEBUG_H__ -#define __COM_DEBUG_H__ +#pragma once #include #include @@ -77,5 +76,3 @@ class DebugInfo { static GroupStateMap m_group_states; /**< for visualizing group states */ #endif }; - -#endif diff --git a/source/blender/compositor/intern/COM_Device.h b/source/blender/compositor/intern/COM_Device.h index 8573f69658e..bb95f1e953c 100644 --- a/source/blender/compositor/intern/COM_Device.h +++ b/source/blender/compositor/intern/COM_Device.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_DEVICE_H__ -#define __COM_DEVICE_H__ +#pragma once #include "COM_WorkPackage.h" @@ -62,5 +61,3 @@ class Device { MEM_CXX_CLASS_ALLOC_FUNCS("COM:Device") #endif }; - -#endif diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.h b/source/blender/compositor/intern/COM_ExecutionGroup.h index 0299dad2ee8..f0dca4e9b34 100644 --- a/source/blender/compositor/intern/COM_ExecutionGroup.h +++ b/source/blender/compositor/intern/COM_ExecutionGroup.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_EXECUTIONGROUP_H__ -#define __COM_EXECUTIONGROUP_H__ +#pragma once #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" @@ -447,5 +446,3 @@ class ExecutionGroup { MEM_CXX_CLASS_ALLOC_FUNCS("COM:ExecutionGroup") #endif }; - -#endif diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.h b/source/blender/compositor/intern/COM_ExecutionSystem.h index bf65594fc4f..44b47787b06 100644 --- a/source/blender/compositor/intern/COM_ExecutionSystem.h +++ b/source/blender/compositor/intern/COM_ExecutionSystem.h @@ -18,8 +18,7 @@ class ExecutionGroup; -#ifndef __COM_EXECUTIONSYSTEM_H__ -#define __COM_EXECUTIONSYSTEM_H__ +#pragma once #include "BKE_text.h" #include "COM_ExecutionGroup.h" @@ -196,5 +195,3 @@ class ExecutionSystem { MEM_CXX_CLASS_ALLOC_FUNCS("COM:ExecutionSystem") #endif }; - -#endif /* __COM_EXECUTIONSYSTEM_H__ */ diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.h b/source/blender/compositor/intern/COM_MemoryBuffer.h index 6ba8f144482..fce1310f6ef 100644 --- a/source/blender/compositor/intern/COM_MemoryBuffer.h +++ b/source/blender/compositor/intern/COM_MemoryBuffer.h @@ -18,8 +18,7 @@ class MemoryBuffer; -#ifndef __COM_MEMORYBUFFER_H__ -#define __COM_MEMORYBUFFER_H__ +#pragma once #include "COM_ExecutionGroup.h" #include "COM_MemoryProxy.h" @@ -357,5 +356,3 @@ class MemoryBuffer { MEM_CXX_CLASS_ALLOC_FUNCS("COM:MemoryBuffer") #endif }; - -#endif diff --git a/source/blender/compositor/intern/COM_MemoryProxy.h b/source/blender/compositor/intern/COM_MemoryProxy.h index afbe0e3c166..a40e6f95dce 100644 --- a/source/blender/compositor/intern/COM_MemoryProxy.h +++ b/source/blender/compositor/intern/COM_MemoryProxy.h @@ -18,8 +18,8 @@ class MemoryProxy; -#ifndef __COM_MEMORYPROXY_H__ -#define __COM_MEMORYPROXY_H__ +#pragma once + #include "COM_ExecutionGroup.h" #include "COM_MemoryBuffer.h" @@ -129,5 +129,3 @@ class MemoryProxy { MEM_CXX_CLASS_ALLOC_FUNCS("COM:MemoryProxy") #endif }; - -#endif diff --git a/source/blender/compositor/intern/COM_Node.h b/source/blender/compositor/intern/COM_Node.h index a2ab1996a19..0a34eff3492 100644 --- a/source/blender/compositor/intern/COM_Node.h +++ b/source/blender/compositor/intern/COM_Node.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_NODE_H__ -#define __COM_NODE_H__ +#pragma once #include "DNA_node_types.h" #include @@ -329,5 +328,3 @@ class NodeOutput { void getEditorValueColor(float *value); void getEditorValueVector(float *value); }; - -#endif /* __COM_NODE_H__ */ diff --git a/source/blender/compositor/intern/COM_NodeConverter.h b/source/blender/compositor/intern/COM_NodeConverter.h index 56e9aa85010..e9b05184857 100644 --- a/source/blender/compositor/intern/COM_NodeConverter.h +++ b/source/blender/compositor/intern/COM_NodeConverter.h @@ -16,8 +16,7 @@ * Copyright 2013, Blender Foundation. */ -#ifndef __COM_NODECONVERTER_H__ -#define __COM_NODECONVERTER_H__ +#pragma once #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" @@ -121,5 +120,3 @@ class NodeConverter { MEM_CXX_CLASS_ALLOC_FUNCS("COM:NodeCompiler") #endif }; - -#endif /* __COM_NODECONVERTER_H__ */ diff --git a/source/blender/compositor/intern/COM_NodeGraph.h b/source/blender/compositor/intern/COM_NodeGraph.h index 531832c2c65..7cbd45bd0b5 100644 --- a/source/blender/compositor/intern/COM_NodeGraph.h +++ b/source/blender/compositor/intern/COM_NodeGraph.h @@ -16,8 +16,7 @@ * Copyright 2013, Blender Foundation. */ -#ifndef __COM_NODEGRAPH_H__ -#define __COM_NODEGRAPH_H__ +#pragma once #include #include @@ -135,5 +134,3 @@ class NodeGraph { MEM_CXX_CLASS_ALLOC_FUNCS("COM:NodeGraph") #endif }; - -#endif /* __COM_NODEGRAPH_H__ */ diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h index d2c896a2e56..d9324729560 100644 --- a/source/blender/compositor/intern/COM_NodeOperation.h +++ b/source/blender/compositor/intern/COM_NodeOperation.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_NODEOPERATION_H__ -#define __COM_NODEOPERATION_H__ +#pragma once #include #include @@ -521,5 +520,3 @@ class NodeOperationOutput { MEM_CXX_CLASS_ALLOC_FUNCS("COM:NodeOperation") #endif }; - -#endif diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.h b/source/blender/compositor/intern/COM_NodeOperationBuilder.h index 917fa2888fd..5dd4022b127 100644 --- a/source/blender/compositor/intern/COM_NodeOperationBuilder.h +++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.h @@ -16,8 +16,7 @@ * Copyright 2013, Blender Foundation. */ -#ifndef __COM_NODEOPERATIONBUILDER_H__ -#define __COM_NODEOPERATIONBUILDER_H__ +#pragma once #include #include @@ -176,5 +175,3 @@ class NodeOperationBuilder { MEM_CXX_CLASS_ALLOC_FUNCS("COM:NodeCompilerImpl") #endif }; - -#endif /* __COM_NODEOPERATIONBUILDER_H__ */ diff --git a/source/blender/compositor/intern/COM_OpenCLDevice.h b/source/blender/compositor/intern/COM_OpenCLDevice.h index 3f6e0fb55ef..d502f5aa34b 100644 --- a/source/blender/compositor/intern/COM_OpenCLDevice.h +++ b/source/blender/compositor/intern/COM_OpenCLDevice.h @@ -18,8 +18,7 @@ class OpenCLDevice; -#ifndef __COM_OPENCLDEVICE_H__ -#define __COM_OPENCLDEVICE_H__ +#pragma once #include "COM_Device.h" #include "COM_ReadBufferOperation.h" @@ -133,5 +132,3 @@ class OpenCLDevice : public Device { NodeOperation *operation); cl_kernel COM_clCreateKernel(const char *kernelname, list *clKernelsToCleanUp); }; - -#endif diff --git a/source/blender/compositor/intern/COM_SingleThreadedOperation.h b/source/blender/compositor/intern/COM_SingleThreadedOperation.h index 68c7f05a6c2..7a97d790afe 100644 --- a/source/blender/compositor/intern/COM_SingleThreadedOperation.h +++ b/source/blender/compositor/intern/COM_SingleThreadedOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_SINGLETHREADEDOPERATION_H__ -#define __COM_SINGLETHREADEDOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" class SingleThreadedOperation : public NodeOperation { @@ -57,4 +57,3 @@ class SingleThreadedOperation : public NodeOperation { return true; } }; -#endif diff --git a/source/blender/compositor/intern/COM_SocketReader.h b/source/blender/compositor/intern/COM_SocketReader.h index 82bebd5e7b9..ee2a6e0e1bf 100644 --- a/source/blender/compositor/intern/COM_SocketReader.h +++ b/source/blender/compositor/intern/COM_SocketReader.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_SOCKETREADER_H__ -#define __COM_SOCKETREADER_H__ +#pragma once + #include "BLI_rect.h" #include "COM_defines.h" @@ -138,5 +138,3 @@ class SocketReader { MEM_CXX_CLASS_ALLOC_FUNCS("COM:SocketReader") #endif }; - -#endif /* __COM_SOCKETREADER_H__ */ diff --git a/source/blender/compositor/intern/COM_WorkPackage.h b/source/blender/compositor/intern/COM_WorkPackage.h index 2a0e47301f5..f4370aa41be 100644 --- a/source/blender/compositor/intern/COM_WorkPackage.h +++ b/source/blender/compositor/intern/COM_WorkPackage.h @@ -18,8 +18,8 @@ class WorkPackage; -#ifndef __COM_WORKPACKAGE_H__ -#define __COM_WORKPACKAGE_H__ +#pragma once + class ExecutionGroup; #include "COM_ExecutionGroup.h" @@ -67,5 +67,3 @@ class WorkPackage { MEM_CXX_CLASS_ALLOC_FUNCS("COM:WorkPackage") #endif }; - -#endif diff --git a/source/blender/compositor/intern/COM_WorkScheduler.h b/source/blender/compositor/intern/COM_WorkScheduler.h index 3a1b4c533bd..2424d1bdb72 100644 --- a/source/blender/compositor/intern/COM_WorkScheduler.h +++ b/source/blender/compositor/intern/COM_WorkScheduler.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_WORKSCHEDULER_H__ -#define __COM_WORKSCHEDULER_H__ +#pragma once #include "COM_ExecutionGroup.h" @@ -116,5 +115,3 @@ class WorkScheduler { MEM_CXX_CLASS_ALLOC_FUNCS("COM:WorkScheduler") #endif }; - -#endif /* __COM_WORKSCHEDULER_H__ */ diff --git a/source/blender/compositor/nodes/COM_AlphaOverNode.h b/source/blender/compositor/nodes/COM_AlphaOverNode.h index 27e868e6f25..32cd2e20204 100644 --- a/source/blender/compositor/nodes/COM_AlphaOverNode.h +++ b/source/blender/compositor/nodes/COM_AlphaOverNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_ALPHAOVERNODE_H__ -#define __COM_ALPHAOVERNODE_H__ +#pragma once #include "COM_Node.h" @@ -32,5 +31,3 @@ class AlphaOverNode : public Node { } void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_BilateralBlurNode.h b/source/blender/compositor/nodes/COM_BilateralBlurNode.h index abed491c891..39308c7d1b6 100644 --- a/source/blender/compositor/nodes/COM_BilateralBlurNode.h +++ b/source/blender/compositor/nodes/COM_BilateralBlurNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_BILATERALBLURNODE_H__ -#define __COM_BILATERALBLURNODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class BilateralBlurNode : public Node { BilateralBlurNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_BlurNode.h b/source/blender/compositor/nodes/COM_BlurNode.h index f0d6cad320e..3c832c93ca2 100644 --- a/source/blender/compositor/nodes/COM_BlurNode.h +++ b/source/blender/compositor/nodes/COM_BlurNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_BLURNODE_H__ -#define __COM_BLURNODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class BlurNode : public Node { BlurNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_BokehBlurNode.h b/source/blender/compositor/nodes/COM_BokehBlurNode.h index e2f728fb30b..87aca9af1f6 100644 --- a/source/blender/compositor/nodes/COM_BokehBlurNode.h +++ b/source/blender/compositor/nodes/COM_BokehBlurNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_BOKEHBLURNODE_H__ -#define __COM_BOKEHBLURNODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class BokehBlurNode : public Node { BokehBlurNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_BokehImageNode.h b/source/blender/compositor/nodes/COM_BokehImageNode.h index 3e78e8d5185..b9d957cd6df 100644 --- a/source/blender/compositor/nodes/COM_BokehImageNode.h +++ b/source/blender/compositor/nodes/COM_BokehImageNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_BOKEHIMAGENODE_H__ -#define __COM_BOKEHIMAGENODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class BokehImageNode : public Node { BokehImageNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_BoxMaskNode.h b/source/blender/compositor/nodes/COM_BoxMaskNode.h index 0d39014bbd0..b815fd75284 100644 --- a/source/blender/compositor/nodes/COM_BoxMaskNode.h +++ b/source/blender/compositor/nodes/COM_BoxMaskNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_BOXMASKNODE_H__ -#define __COM_BOXMASKNODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class BoxMaskNode : public Node { BoxMaskNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_BrightnessNode.h b/source/blender/compositor/nodes/COM_BrightnessNode.h index 8529fc17d9c..b64b622dd71 100644 --- a/source/blender/compositor/nodes/COM_BrightnessNode.h +++ b/source/blender/compositor/nodes/COM_BrightnessNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_BRIGHTNESSNODE_H__ -#define __COM_BRIGHTNESSNODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class BrightnessNode : public Node { BrightnessNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_ChannelMatteNode.h b/source/blender/compositor/nodes/COM_ChannelMatteNode.h index e6cd8bf6f0d..bca821fa60c 100644 --- a/source/blender/compositor/nodes/COM_ChannelMatteNode.h +++ b/source/blender/compositor/nodes/COM_ChannelMatteNode.h @@ -16,8 +16,7 @@ * Copyright 2012, Blender Foundation. */ -#ifndef __COM_CHANNELMATTENODE_H__ -#define __COM_CHANNELMATTENODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class ChannelMatteNode : public Node { ChannelMatteNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif /* COM_ChannelMatteNODE_H */ diff --git a/source/blender/compositor/nodes/COM_ChromaMatteNode.h b/source/blender/compositor/nodes/COM_ChromaMatteNode.h index cfb6f23ebcb..d8febdde36f 100644 --- a/source/blender/compositor/nodes/COM_ChromaMatteNode.h +++ b/source/blender/compositor/nodes/COM_ChromaMatteNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_CHROMAMATTENODE_H__ -#define __COM_CHROMAMATTENODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class ChromaMatteNode : public Node { ChromaMatteNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif /* COM_ChromaMatteNODE_H */ diff --git a/source/blender/compositor/nodes/COM_ColorBalanceNode.h b/source/blender/compositor/nodes/COM_ColorBalanceNode.h index 482b34e7809..302b66863ca 100644 --- a/source/blender/compositor/nodes/COM_ColorBalanceNode.h +++ b/source/blender/compositor/nodes/COM_ColorBalanceNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_COLORBALANCENODE_H__ -#define __COM_COLORBALANCENODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class ColorBalanceNode : public Node { ColorBalanceNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif /* COM_ColorBalanceNODE_H */ diff --git a/source/blender/compositor/nodes/COM_ColorCorrectionNode.h b/source/blender/compositor/nodes/COM_ColorCorrectionNode.h index 0275106095e..be6545f0cfa 100644 --- a/source/blender/compositor/nodes/COM_ColorCorrectionNode.h +++ b/source/blender/compositor/nodes/COM_ColorCorrectionNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_COLORCORRECTIONNODE_H__ -#define __COM_COLORCORRECTIONNODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class ColorCorrectionNode : public Node { ColorCorrectionNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_ColorCurveNode.h b/source/blender/compositor/nodes/COM_ColorCurveNode.h index 2a529e5713e..6eaf1db6fbb 100644 --- a/source/blender/compositor/nodes/COM_ColorCurveNode.h +++ b/source/blender/compositor/nodes/COM_ColorCurveNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_COLORCURVENODE_H__ -#define __COM_COLORCURVENODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class ColorCurveNode : public Node { ColorCurveNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_ColorMatteNode.h b/source/blender/compositor/nodes/COM_ColorMatteNode.h index 1f02a091307..e84bdfc836f 100644 --- a/source/blender/compositor/nodes/COM_ColorMatteNode.h +++ b/source/blender/compositor/nodes/COM_ColorMatteNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_COLORMATTENODE_H__ -#define __COM_COLORMATTENODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class ColorMatteNode : public Node { ColorMatteNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif /* COM_ColorMatteNODE_H */ diff --git a/source/blender/compositor/nodes/COM_ColorNode.h b/source/blender/compositor/nodes/COM_ColorNode.h index 5c7580a9ec9..9b50e9ab7d4 100644 --- a/source/blender/compositor/nodes/COM_ColorNode.h +++ b/source/blender/compositor/nodes/COM_ColorNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_COLORNODE_H__ -#define __COM_COLORNODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class ColorNode : public Node { ColorNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_ColorRampNode.h b/source/blender/compositor/nodes/COM_ColorRampNode.h index 3f7a188e549..b53edf14dbd 100644 --- a/source/blender/compositor/nodes/COM_ColorRampNode.h +++ b/source/blender/compositor/nodes/COM_ColorRampNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_COLORRAMPNODE_H__ -#define __COM_COLORRAMPNODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class ColorRampNode : public Node { ColorRampNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif /* COM_ColorRampNODE_H */ diff --git a/source/blender/compositor/nodes/COM_ColorSpillNode.h b/source/blender/compositor/nodes/COM_ColorSpillNode.h index 4678d1dd7b1..3cf8072c7b7 100644 --- a/source/blender/compositor/nodes/COM_ColorSpillNode.h +++ b/source/blender/compositor/nodes/COM_ColorSpillNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_COLORSPILLNODE_H__ -#define __COM_COLORSPILLNODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class ColorSpillNode : public Node { ColorSpillNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif /* COM_ColorSpillNODE_H */ diff --git a/source/blender/compositor/nodes/COM_ColorToBWNode.h b/source/blender/compositor/nodes/COM_ColorToBWNode.h index d811cab8019..6e7025de496 100644 --- a/source/blender/compositor/nodes/COM_ColorToBWNode.h +++ b/source/blender/compositor/nodes/COM_ColorToBWNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_COLORTOBWNODE_H__ -#define __COM_COLORTOBWNODE_H__ +#pragma once #include "COM_Node.h" #include "DNA_node_types.h" @@ -30,4 +29,3 @@ class ColorToBWNode : public Node { ColorToBWNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; -#endif diff --git a/source/blender/compositor/nodes/COM_CombineColorNode.h b/source/blender/compositor/nodes/COM_CombineColorNode.h index 203a8e84306..378a4855abf 100644 --- a/source/blender/compositor/nodes/COM_CombineColorNode.h +++ b/source/blender/compositor/nodes/COM_CombineColorNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_COMBINECOLORNODE_H__ -#define __COM_COMBINECOLORNODE_H__ +#pragma once #include "COM_Node.h" @@ -65,5 +64,3 @@ class CombineYUVANode : public CombineColorNode { NodeOperation *getColorConverter(const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_CompositorNode.h b/source/blender/compositor/nodes/COM_CompositorNode.h index 8fb2a5a5cf5..a75355dfc14 100644 --- a/source/blender/compositor/nodes/COM_CompositorNode.h +++ b/source/blender/compositor/nodes/COM_CompositorNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_COMPOSITORNODE_H__ -#define __COM_COMPOSITORNODE_H__ +#pragma once #include "COM_Node.h" #include "DNA_node_types.h" @@ -30,4 +29,3 @@ class CompositorNode : public Node { CompositorNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; -#endif diff --git a/source/blender/compositor/nodes/COM_ConvertAlphaNode.h b/source/blender/compositor/nodes/COM_ConvertAlphaNode.h index 8fdeae39ada..372f34a576f 100644 --- a/source/blender/compositor/nodes/COM_ConvertAlphaNode.h +++ b/source/blender/compositor/nodes/COM_ConvertAlphaNode.h @@ -16,8 +16,7 @@ * Copyright 2012, Blender Foundation. */ -#ifndef __COM_CONVERTALPHANODE_H__ -#define __COM_CONVERTALPHANODE_H__ +#pragma once #include "COM_Node.h" @@ -32,5 +31,3 @@ class ConvertAlphaNode : public Node { } void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_CornerPinNode.h b/source/blender/compositor/nodes/COM_CornerPinNode.h index a8e88a0ef4f..ba845a614fb 100644 --- a/source/blender/compositor/nodes/COM_CornerPinNode.h +++ b/source/blender/compositor/nodes/COM_CornerPinNode.h @@ -15,8 +15,7 @@ * Copyright 2014, Blender Foundation. */ -#ifndef __COM_CORNERPINNODE_H__ -#define __COM_CORNERPINNODE_H__ +#pragma once #include "COM_Node.h" @@ -31,5 +30,3 @@ class CornerPinNode : public Node { CornerPinNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif /* __COM_CORNERPINNODE_H__ */ diff --git a/source/blender/compositor/nodes/COM_CropNode.h b/source/blender/compositor/nodes/COM_CropNode.h index 295d4fb77e1..f643ebbabcc 100644 --- a/source/blender/compositor/nodes/COM_CropNode.h +++ b/source/blender/compositor/nodes/COM_CropNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_CROPNODE_H__ -#define __COM_CROPNODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class CropNode : public Node { CropNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_CryptomatteNode.h b/source/blender/compositor/nodes/COM_CryptomatteNode.h index 91f8051f125..1fb8893efa0 100644 --- a/source/blender/compositor/nodes/COM_CryptomatteNode.h +++ b/source/blender/compositor/nodes/COM_CryptomatteNode.h @@ -16,8 +16,7 @@ * Copyright 2018, Blender Foundation. */ -#ifndef __COM_CRYPTOMATTENODE_H__ -#define __COM_CRYPTOMATTENODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class CryptomatteNode : public Node { CryptomatteNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_DefocusNode.h b/source/blender/compositor/nodes/COM_DefocusNode.h index f2589c7ae1a..c042e98c515 100644 --- a/source/blender/compositor/nodes/COM_DefocusNode.h +++ b/source/blender/compositor/nodes/COM_DefocusNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_DEFOCUSNODE_H__ -#define __COM_DEFOCUSNODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class DefocusNode : public Node { DefocusNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_DenoiseNode.h b/source/blender/compositor/nodes/COM_DenoiseNode.h index 6cbe598f7d2..99f59c89fdb 100644 --- a/source/blender/compositor/nodes/COM_DenoiseNode.h +++ b/source/blender/compositor/nodes/COM_DenoiseNode.h @@ -16,8 +16,7 @@ * Copyright 2019, Blender Foundation. */ -#ifndef __COM_DENOISENODE_H__ -#define __COM_DENOISENODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class DenoiseNode : public Node { DenoiseNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_DespeckleNode.h b/source/blender/compositor/nodes/COM_DespeckleNode.h index ee510a0568c..6b39dd94ac7 100644 --- a/source/blender/compositor/nodes/COM_DespeckleNode.h +++ b/source/blender/compositor/nodes/COM_DespeckleNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_DESPECKLENODE_H__ -#define __COM_DESPECKLENODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class DespeckleNode : public Node { DespeckleNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_DifferenceMatteNode.h b/source/blender/compositor/nodes/COM_DifferenceMatteNode.h index 3a86a0bbf85..26be5fe1e80 100644 --- a/source/blender/compositor/nodes/COM_DifferenceMatteNode.h +++ b/source/blender/compositor/nodes/COM_DifferenceMatteNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_DIFFERENCEMATTENODE_H__ -#define __COM_DIFFERENCEMATTENODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class DifferenceMatteNode : public Node { DifferenceMatteNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif /* COM_DifferenceMatteNODE_H */ diff --git a/source/blender/compositor/nodes/COM_DilateErodeNode.h b/source/blender/compositor/nodes/COM_DilateErodeNode.h index d5b2863a4bb..090095df447 100644 --- a/source/blender/compositor/nodes/COM_DilateErodeNode.h +++ b/source/blender/compositor/nodes/COM_DilateErodeNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_DILATEERODENODE_H__ -#define __COM_DILATEERODENODE_H__ +#pragma once #include "COM_Node.h" @@ -33,5 +32,3 @@ class DilateErodeNode : public Node { DilateErodeNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_DirectionalBlurNode.h b/source/blender/compositor/nodes/COM_DirectionalBlurNode.h index 0f9249a83a5..dfb705cbe64 100644 --- a/source/blender/compositor/nodes/COM_DirectionalBlurNode.h +++ b/source/blender/compositor/nodes/COM_DirectionalBlurNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_DIRECTIONALBLURNODE_H__ -#define __COM_DIRECTIONALBLURNODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class DirectionalBlurNode : public Node { DirectionalBlurNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_DisplaceNode.h b/source/blender/compositor/nodes/COM_DisplaceNode.h index e6a13e06772..a9e8a5ad657 100644 --- a/source/blender/compositor/nodes/COM_DisplaceNode.h +++ b/source/blender/compositor/nodes/COM_DisplaceNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_DISPLACENODE_H__ -#define __COM_DISPLACENODE_H__ +#pragma once #include "COM_Node.h" @@ -30,4 +29,3 @@ class DisplaceNode : public Node { DisplaceNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; -#endif diff --git a/source/blender/compositor/nodes/COM_DistanceMatteNode.h b/source/blender/compositor/nodes/COM_DistanceMatteNode.h index baba9bb8c97..6ae71ef715f 100644 --- a/source/blender/compositor/nodes/COM_DistanceMatteNode.h +++ b/source/blender/compositor/nodes/COM_DistanceMatteNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_DISTANCEMATTENODE_H__ -#define __COM_DISTANCEMATTENODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class DistanceMatteNode : public Node { DistanceMatteNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif /* COM_DistanceMatteNODE_H */ diff --git a/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.h b/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.h index c45d42675f3..6d26cbbf528 100644 --- a/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.h +++ b/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_DOUBLEEDGEMASKNODE_H__ -#define __COM_DOUBLEEDGEMASKNODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class DoubleEdgeMaskNode : public Node { DoubleEdgeMaskNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_EllipseMaskNode.h b/source/blender/compositor/nodes/COM_EllipseMaskNode.h index b7093bf68fa..d7376cad52e 100644 --- a/source/blender/compositor/nodes/COM_EllipseMaskNode.h +++ b/source/blender/compositor/nodes/COM_EllipseMaskNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_ELLIPSEMASKNODE_H__ -#define __COM_ELLIPSEMASKNODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class EllipseMaskNode : public Node { EllipseMaskNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_FilterNode.h b/source/blender/compositor/nodes/COM_FilterNode.h index d0e824051bb..735d8925b48 100644 --- a/source/blender/compositor/nodes/COM_FilterNode.h +++ b/source/blender/compositor/nodes/COM_FilterNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_FILTERNODE_H__ -#define __COM_FILTERNODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class FilterNode : public Node { FilterNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif /* __COM_FILTERNODE_H__ */ diff --git a/source/blender/compositor/nodes/COM_FlipNode.h b/source/blender/compositor/nodes/COM_FlipNode.h index 2122961dac9..e819c003430 100644 --- a/source/blender/compositor/nodes/COM_FlipNode.h +++ b/source/blender/compositor/nodes/COM_FlipNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_FLIPNODE_H__ -#define __COM_FLIPNODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class FlipNode : public Node { FlipNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_GammaNode.h b/source/blender/compositor/nodes/COM_GammaNode.h index 46573fc4b3f..1a4d02af160 100644 --- a/source/blender/compositor/nodes/COM_GammaNode.h +++ b/source/blender/compositor/nodes/COM_GammaNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_GAMMANODE_H__ -#define __COM_GAMMANODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class GammaNode : public Node { GammaNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_GlareNode.h b/source/blender/compositor/nodes/COM_GlareNode.h index 051ae1d1dc3..7463af97306 100644 --- a/source/blender/compositor/nodes/COM_GlareNode.h +++ b/source/blender/compositor/nodes/COM_GlareNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_GLARENODE_H__ -#define __COM_GLARENODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class GlareNode : public Node { GlareNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.h b/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.h index 270d29cc41b..01790c1a5fb 100644 --- a/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.h +++ b/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_HUESATURATIONVALUECORRECTNODE_H__ -#define __COM_HUESATURATIONVALUECORRECTNODE_H__ +#pragma once #include "COM_Node.h" @@ -30,4 +29,3 @@ class HueSaturationValueCorrectNode : public Node { HueSaturationValueCorrectNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; -#endif diff --git a/source/blender/compositor/nodes/COM_HueSaturationValueNode.h b/source/blender/compositor/nodes/COM_HueSaturationValueNode.h index 5e023a0762d..7ef7abe4188 100644 --- a/source/blender/compositor/nodes/COM_HueSaturationValueNode.h +++ b/source/blender/compositor/nodes/COM_HueSaturationValueNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_HUESATURATIONVALUENODE_H__ -#define __COM_HUESATURATIONVALUENODE_H__ +#pragma once #include "COM_Node.h" @@ -30,4 +29,3 @@ class HueSaturationValueNode : public Node { HueSaturationValueNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; -#endif diff --git a/source/blender/compositor/nodes/COM_IDMaskNode.h b/source/blender/compositor/nodes/COM_IDMaskNode.h index 3f4019bf5b7..51076619951 100644 --- a/source/blender/compositor/nodes/COM_IDMaskNode.h +++ b/source/blender/compositor/nodes/COM_IDMaskNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_IDMASKNODE_H__ -#define __COM_IDMASKNODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class IDMaskNode : public Node { IDMaskNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_ImageNode.h b/source/blender/compositor/nodes/COM_ImageNode.h index 7883f4d7ab3..9481ef4f7b1 100644 --- a/source/blender/compositor/nodes/COM_ImageNode.h +++ b/source/blender/compositor/nodes/COM_ImageNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_IMAGENODE_H__ -#define __COM_IMAGENODE_H__ +#pragma once #include "COM_Node.h" #include "COM_defines.h" @@ -46,5 +45,3 @@ class ImageNode : public Node { ImageNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif /* __COM_IMAGENODE_H__ */ diff --git a/source/blender/compositor/nodes/COM_InpaintNode.h b/source/blender/compositor/nodes/COM_InpaintNode.h index 61a7ac63146..3f778c8ba5c 100644 --- a/source/blender/compositor/nodes/COM_InpaintNode.h +++ b/source/blender/compositor/nodes/COM_InpaintNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_INPAINTNODE_H__ -#define __COM_INPAINTNODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class InpaintNode : public Node { InpaintNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_InvertNode.h b/source/blender/compositor/nodes/COM_InvertNode.h index 02e2eb38dc9..d90d6e48713 100644 --- a/source/blender/compositor/nodes/COM_InvertNode.h +++ b/source/blender/compositor/nodes/COM_InvertNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_INVERTNODE_H__ -#define __COM_INVERTNODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class InvertNode : public Node { InvertNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_KeyingNode.h b/source/blender/compositor/nodes/COM_KeyingNode.h index fc5f55e33ae..cfb1f2e6ddf 100644 --- a/source/blender/compositor/nodes/COM_KeyingNode.h +++ b/source/blender/compositor/nodes/COM_KeyingNode.h @@ -16,8 +16,7 @@ * Copyright 2012, Blender Foundation. */ -#ifndef __COM_KEYINGNODE_H__ -#define __COM_KEYINGNODE_H__ +#pragma once #include "COM_Node.h" @@ -58,5 +57,3 @@ class KeyingNode : public Node { KeyingNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif /* __COM_KEYINGNODE_H__ */ diff --git a/source/blender/compositor/nodes/COM_KeyingScreenNode.h b/source/blender/compositor/nodes/COM_KeyingScreenNode.h index 12db2ed8889..ce9ef54543d 100644 --- a/source/blender/compositor/nodes/COM_KeyingScreenNode.h +++ b/source/blender/compositor/nodes/COM_KeyingScreenNode.h @@ -16,8 +16,7 @@ * Copyright 2012, Blender Foundation. */ -#ifndef __COM_KEYINGSCREENNODE_H__ -#define __COM_KEYINGSCREENNODE_H__ +#pragma once #include "COM_Node.h" #include "DNA_node_types.h" @@ -31,5 +30,3 @@ class KeyingScreenNode : public Node { KeyingScreenNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif /* __COM_KEYINGSCREENNODE_H__ */ diff --git a/source/blender/compositor/nodes/COM_LensDistortionNode.h b/source/blender/compositor/nodes/COM_LensDistortionNode.h index f4d9e127558..8df0e3f7df1 100644 --- a/source/blender/compositor/nodes/COM_LensDistortionNode.h +++ b/source/blender/compositor/nodes/COM_LensDistortionNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_LENSDISTORTIONNODE_H__ -#define __COM_LENSDISTORTIONNODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class LensDistortionNode : public Node { LensDistortionNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_LuminanceMatteNode.h b/source/blender/compositor/nodes/COM_LuminanceMatteNode.h index 57a8f25602a..7f2d9dfbe95 100644 --- a/source/blender/compositor/nodes/COM_LuminanceMatteNode.h +++ b/source/blender/compositor/nodes/COM_LuminanceMatteNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_LUMINANCEMATTENODE_H__ -#define __COM_LUMINANCEMATTENODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class LuminanceMatteNode : public Node { LuminanceMatteNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif /* __COM_LUMINANCEMATTENODE_H__ */ diff --git a/source/blender/compositor/nodes/COM_MapRangeNode.h b/source/blender/compositor/nodes/COM_MapRangeNode.h index b63524291c1..b838ea858ee 100644 --- a/source/blender/compositor/nodes/COM_MapRangeNode.h +++ b/source/blender/compositor/nodes/COM_MapRangeNode.h @@ -16,8 +16,7 @@ * Copyright 2012, Blender Foundation. */ -#ifndef __COM_MAPRANGENODE_H__ -#define __COM_MAPRANGENODE_H__ +#pragma once #include "COM_Node.h" #include "DNA_node_types.h" @@ -30,5 +29,3 @@ class MapRangeNode : public Node { MapRangeNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif /* __COM_MAPRANGENODE_H__ */ diff --git a/source/blender/compositor/nodes/COM_MapUVNode.h b/source/blender/compositor/nodes/COM_MapUVNode.h index 46892453b92..f9fc413dbe5 100644 --- a/source/blender/compositor/nodes/COM_MapUVNode.h +++ b/source/blender/compositor/nodes/COM_MapUVNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_MAPUVNODE_H__ -#define __COM_MAPUVNODE_H__ +#pragma once #include "COM_Node.h" @@ -30,4 +29,3 @@ class MapUVNode : public Node { MapUVNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; -#endif diff --git a/source/blender/compositor/nodes/COM_MapValueNode.h b/source/blender/compositor/nodes/COM_MapValueNode.h index 289b4f24138..60ee262d447 100644 --- a/source/blender/compositor/nodes/COM_MapValueNode.h +++ b/source/blender/compositor/nodes/COM_MapValueNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_MAPVALUENODE_H__ -#define __COM_MAPVALUENODE_H__ +#pragma once #include "COM_Node.h" #include "DNA_node_types.h" @@ -30,5 +29,3 @@ class MapValueNode : public Node { MapValueNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif /* __COM_MAPVALUENODE_H__ */ diff --git a/source/blender/compositor/nodes/COM_MaskNode.h b/source/blender/compositor/nodes/COM_MaskNode.h index 6c8006a8de6..4a03916b3c2 100644 --- a/source/blender/compositor/nodes/COM_MaskNode.h +++ b/source/blender/compositor/nodes/COM_MaskNode.h @@ -16,8 +16,7 @@ * Copyright 2012, Blender Foundation. */ -#ifndef __COM_MASKNODE_H__ -#define __COM_MASKNODE_H__ +#pragma once #include "COM_Node.h" #include "DNA_node_types.h" @@ -31,5 +30,3 @@ class MaskNode : public Node { MaskNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif /* __COM_MASKNODE_H__ */ diff --git a/source/blender/compositor/nodes/COM_MathNode.h b/source/blender/compositor/nodes/COM_MathNode.h index e53d84a221f..41b144679ac 100644 --- a/source/blender/compositor/nodes/COM_MathNode.h +++ b/source/blender/compositor/nodes/COM_MathNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_MATHNODE_H__ -#define __COM_MATHNODE_H__ +#pragma once #include "COM_Node.h" @@ -32,5 +31,3 @@ class MathNode : public Node { } void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_MixNode.h b/source/blender/compositor/nodes/COM_MixNode.h index 511e1ffa7a8..91ce29fdbf2 100644 --- a/source/blender/compositor/nodes/COM_MixNode.h +++ b/source/blender/compositor/nodes/COM_MixNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_MIXNODE_H__ -#define __COM_MIXNODE_H__ +#pragma once #include "COM_Node.h" #include "DNA_node_types.h" @@ -30,4 +29,3 @@ class MixNode : public Node { MixNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; -#endif diff --git a/source/blender/compositor/nodes/COM_MovieClipNode.h b/source/blender/compositor/nodes/COM_MovieClipNode.h index 2c3f29772d5..58262592dca 100644 --- a/source/blender/compositor/nodes/COM_MovieClipNode.h +++ b/source/blender/compositor/nodes/COM_MovieClipNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_MOVIECLIPNODE_H__ -#define __COM_MOVIECLIPNODE_H__ +#pragma once #include "COM_Node.h" #include "DNA_node_types.h" @@ -31,5 +30,3 @@ class MovieClipNode : public Node { MovieClipNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif /* __COM_MOVIECLIPNODE_H__ */ diff --git a/source/blender/compositor/nodes/COM_MovieDistortionNode.h b/source/blender/compositor/nodes/COM_MovieDistortionNode.h index da687080691..f4df48dac13 100644 --- a/source/blender/compositor/nodes/COM_MovieDistortionNode.h +++ b/source/blender/compositor/nodes/COM_MovieDistortionNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_MOVIEDISTORTIONNODE_H__ -#define __COM_MOVIEDISTORTIONNODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class MovieDistortionNode : public Node { MovieDistortionNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_NormalNode.h b/source/blender/compositor/nodes/COM_NormalNode.h index 4151960c506..c23e83fb023 100644 --- a/source/blender/compositor/nodes/COM_NormalNode.h +++ b/source/blender/compositor/nodes/COM_NormalNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_NORMALNODE_H__ -#define __COM_NORMALNODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class NormalNode : public Node { NormalNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif /* COM_NormalNODE_H */ diff --git a/source/blender/compositor/nodes/COM_NormalizeNode.h b/source/blender/compositor/nodes/COM_NormalizeNode.h index 593c98f2ce2..7e53ac7e9a0 100644 --- a/source/blender/compositor/nodes/COM_NormalizeNode.h +++ b/source/blender/compositor/nodes/COM_NormalizeNode.h @@ -16,8 +16,7 @@ * Copyright 2012, Blender Foundation. */ -#ifndef __COM_NORMALIZENODE_H__ -#define __COM_NORMALIZENODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class NormalizeNode : public Node { NormalizeNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_OutputFileNode.h b/source/blender/compositor/nodes/COM_OutputFileNode.h index 932fa375a3a..037a345fa50 100644 --- a/source/blender/compositor/nodes/COM_OutputFileNode.h +++ b/source/blender/compositor/nodes/COM_OutputFileNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_OUTPUTFILENODE_H__ -#define __COM_OUTPUTFILENODE_H__ +#pragma once #include "COM_Node.h" #include "DNA_node_types.h" @@ -31,5 +30,3 @@ class OutputFileNode : public Node { OutputFileNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_PixelateNode.h b/source/blender/compositor/nodes/COM_PixelateNode.h index f46035398e2..87cb4df59e8 100644 --- a/source/blender/compositor/nodes/COM_PixelateNode.h +++ b/source/blender/compositor/nodes/COM_PixelateNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_PIXELATENODE_H__ -#define __COM_PIXELATENODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class PixelateNode : public Node { PixelateNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h b/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h index 2c17739a220..36844bc1650 100644 --- a/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h +++ b/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h @@ -16,8 +16,7 @@ * Copyright 2013, Blender Foundation. */ -#ifndef __COM_PLANETRACKDEFORMNODE_H__ -#define __COM_PLANETRACKDEFORMNODE_H__ +#pragma once #include "COM_Node.h" @@ -33,5 +32,3 @@ class PlaneTrackDeformNode : public Node { PlaneTrackDeformNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif /* __COM_PLANETRACKDEFORMNODE_H__ */ diff --git a/source/blender/compositor/nodes/COM_RenderLayersNode.h b/source/blender/compositor/nodes/COM_RenderLayersNode.h index c992f60581f..1ffd084ad1e 100644 --- a/source/blender/compositor/nodes/COM_RenderLayersNode.h +++ b/source/blender/compositor/nodes/COM_RenderLayersNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_RENDERLAYERSNODE_H__ -#define __COM_RENDERLAYERSNODE_H__ +#pragma once #include "COM_Node.h" #include "COM_RenderLayersProg.h" @@ -49,5 +48,3 @@ class RenderLayersNode : public Node { void missingSocketLink(NodeConverter &converter, NodeOutput *output) const; void missingRenderLink(NodeConverter &converter) const; }; - -#endif /* __COM_RENDERLAYERSNODE_H__ */ diff --git a/source/blender/compositor/nodes/COM_RotateNode.h b/source/blender/compositor/nodes/COM_RotateNode.h index e7440bb7a8e..b75fdd52683 100644 --- a/source/blender/compositor/nodes/COM_RotateNode.h +++ b/source/blender/compositor/nodes/COM_RotateNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_ROTATENODE_H__ -#define __COM_ROTATENODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class RotateNode : public Node { RotateNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_ScaleNode.h b/source/blender/compositor/nodes/COM_ScaleNode.h index b6e589cfcec..c9a02411b1c 100644 --- a/source/blender/compositor/nodes/COM_ScaleNode.h +++ b/source/blender/compositor/nodes/COM_ScaleNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_SCALENODE_H__ -#define __COM_SCALENODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class ScaleNode : public Node { ScaleNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_SeparateColorNode.h b/source/blender/compositor/nodes/COM_SeparateColorNode.h index f98a9d6d12f..aaf86c6e22b 100644 --- a/source/blender/compositor/nodes/COM_SeparateColorNode.h +++ b/source/blender/compositor/nodes/COM_SeparateColorNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_SEPARATECOLORNODE_H__ -#define __COM_SEPARATECOLORNODE_H__ +#pragma once #include "COM_Node.h" @@ -65,5 +64,3 @@ class SeparateYUVANode : public SeparateColorNode { NodeOperation *getColorConverter(const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_SetAlphaNode.h b/source/blender/compositor/nodes/COM_SetAlphaNode.h index 9882b3e62e9..2e652539cec 100644 --- a/source/blender/compositor/nodes/COM_SetAlphaNode.h +++ b/source/blender/compositor/nodes/COM_SetAlphaNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_SETALPHANODE_H__ -#define __COM_SETALPHANODE_H__ +#pragma once #include "COM_Node.h" @@ -32,5 +31,3 @@ class SetAlphaNode : public Node { } void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_SocketProxyNode.h b/source/blender/compositor/nodes/COM_SocketProxyNode.h index 21e888d323e..a0c0b63dafd 100644 --- a/source/blender/compositor/nodes/COM_SocketProxyNode.h +++ b/source/blender/compositor/nodes/COM_SocketProxyNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_SOCKETPROXYNODE_H__ -#define __COM_SOCKETPROXYNODE_H__ +#pragma once #include "COM_Node.h" @@ -52,5 +51,3 @@ class SocketBufferNode : public Node { SocketBufferNode(bNode *editorNode, bNodeSocket *editorInput, bNodeSocket *editorOutput); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_SplitViewerNode.h b/source/blender/compositor/nodes/COM_SplitViewerNode.h index 2e350720841..c9ce5164ef4 100644 --- a/source/blender/compositor/nodes/COM_SplitViewerNode.h +++ b/source/blender/compositor/nodes/COM_SplitViewerNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_SPLITVIEWERNODE_H__ -#define __COM_SPLITVIEWERNODE_H__ +#pragma once #include "COM_Node.h" #include "DNA_node_types.h" @@ -30,4 +29,3 @@ class SplitViewerNode : public Node { SplitViewerNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; -#endif diff --git a/source/blender/compositor/nodes/COM_Stabilize2dNode.h b/source/blender/compositor/nodes/COM_Stabilize2dNode.h index bbf7b239d82..cb46926a3f3 100644 --- a/source/blender/compositor/nodes/COM_Stabilize2dNode.h +++ b/source/blender/compositor/nodes/COM_Stabilize2dNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_STABILIZE2DNODE_H__ -#define __COM_STABILIZE2DNODE_H__ +#pragma once #include "COM_Node.h" #include "DNA_node_types.h" @@ -31,5 +30,3 @@ class Stabilize2dNode : public Node { Stabilize2dNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_SunBeamsNode.h b/source/blender/compositor/nodes/COM_SunBeamsNode.h index 9d35f40f760..9a56fc1fcea 100644 --- a/source/blender/compositor/nodes/COM_SunBeamsNode.h +++ b/source/blender/compositor/nodes/COM_SunBeamsNode.h @@ -15,8 +15,7 @@ * Copyright 2014, Blender Foundation. */ -#ifndef __COM_SUNBEAMSNODE_H__ -#define __COM_SUNBEAMSNODE_H__ +#pragma once #include "COM_Node.h" @@ -29,5 +28,3 @@ class SunBeamsNode : public Node { SunBeamsNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_SwitchNode.h b/source/blender/compositor/nodes/COM_SwitchNode.h index 509b748b18a..d4d8dd23a98 100644 --- a/source/blender/compositor/nodes/COM_SwitchNode.h +++ b/source/blender/compositor/nodes/COM_SwitchNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_SWITCHNODE_H__ -#define __COM_SWITCHNODE_H__ +#pragma once #include "COM_Node.h" #include "COM_NodeOperation.h" @@ -31,4 +30,3 @@ class SwitchNode : public Node { SwitchNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; -#endif diff --git a/source/blender/compositor/nodes/COM_SwitchViewNode.h b/source/blender/compositor/nodes/COM_SwitchViewNode.h index 0260621961d..9423740f668 100644 --- a/source/blender/compositor/nodes/COM_SwitchViewNode.h +++ b/source/blender/compositor/nodes/COM_SwitchViewNode.h @@ -16,8 +16,7 @@ * Copyright 2015, Blender Foundation. */ -#ifndef __COM_SWITCHVIEWNODE_H__ -#define __COM_SWITCHVIEWNODE_H__ +#pragma once #include "COM_Node.h" #include "COM_NodeOperation.h" @@ -31,4 +30,3 @@ class SwitchViewNode : public Node { SwitchViewNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; -#endif diff --git a/source/blender/compositor/nodes/COM_TextureNode.h b/source/blender/compositor/nodes/COM_TextureNode.h index 8fe620a89b3..4d780850190 100644 --- a/source/blender/compositor/nodes/COM_TextureNode.h +++ b/source/blender/compositor/nodes/COM_TextureNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_TEXTURENODE_H__ -#define __COM_TEXTURENODE_H__ +#pragma once #include "COM_Node.h" #include "DNA_node_types.h" @@ -31,5 +30,3 @@ class TextureNode : public Node { TextureNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif /* __COM_TEXTURENODE_H__ */ diff --git a/source/blender/compositor/nodes/COM_TimeNode.h b/source/blender/compositor/nodes/COM_TimeNode.h index 230ffe3b676..78177014dc1 100644 --- a/source/blender/compositor/nodes/COM_TimeNode.h +++ b/source/blender/compositor/nodes/COM_TimeNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_TIMENODE_H__ -#define __COM_TIMENODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class TimeNode : public Node { TimeNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_TonemapNode.h b/source/blender/compositor/nodes/COM_TonemapNode.h index 9e6c01a5e45..d934a1ede5b 100644 --- a/source/blender/compositor/nodes/COM_TonemapNode.h +++ b/source/blender/compositor/nodes/COM_TonemapNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_TONEMAPNODE_H__ -#define __COM_TONEMAPNODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class TonemapNode : public Node { TonemapNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_TrackPositionNode.h b/source/blender/compositor/nodes/COM_TrackPositionNode.h index 7136077a123..37d3d25d592 100644 --- a/source/blender/compositor/nodes/COM_TrackPositionNode.h +++ b/source/blender/compositor/nodes/COM_TrackPositionNode.h @@ -16,8 +16,7 @@ * Copyright 2012, Blender Foundation. */ -#ifndef __COM_TRACKPOSITIONNODE_H__ -#define __COM_TRACKPOSITIONNODE_H__ +#pragma once #include "COM_Node.h" #include "DNA_node_types.h" @@ -31,5 +30,3 @@ class TrackPositionNode : public Node { TrackPositionNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif /* __COM_TRACKPOSITIONNODE_H__ */ diff --git a/source/blender/compositor/nodes/COM_TransformNode.h b/source/blender/compositor/nodes/COM_TransformNode.h index 12eb66a19bb..bd01808d662 100644 --- a/source/blender/compositor/nodes/COM_TransformNode.h +++ b/source/blender/compositor/nodes/COM_TransformNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_TRANSFORMNODE_H__ -#define __COM_TRANSFORMNODE_H__ +#pragma once #include "COM_Node.h" #include "DNA_node_types.h" @@ -31,5 +30,3 @@ class TransformNode : public Node { TransformNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif /* __COM_TRANSFORMNODE_H__ */ diff --git a/source/blender/compositor/nodes/COM_TranslateNode.h b/source/blender/compositor/nodes/COM_TranslateNode.h index d9ef6c639a0..d381274c0e5 100644 --- a/source/blender/compositor/nodes/COM_TranslateNode.h +++ b/source/blender/compositor/nodes/COM_TranslateNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_TRANSLATENODE_H__ -#define __COM_TRANSLATENODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class TranslateNode : public Node { TranslateNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_ValueNode.h b/source/blender/compositor/nodes/COM_ValueNode.h index a973649aa46..5179e6828e4 100644 --- a/source/blender/compositor/nodes/COM_ValueNode.h +++ b/source/blender/compositor/nodes/COM_ValueNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_VALUENODE_H__ -#define __COM_VALUENODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class ValueNode : public Node { ValueNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_VectorBlurNode.h b/source/blender/compositor/nodes/COM_VectorBlurNode.h index 027c241f72d..f370c82a1ee 100644 --- a/source/blender/compositor/nodes/COM_VectorBlurNode.h +++ b/source/blender/compositor/nodes/COM_VectorBlurNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_VECTORBLURNODE_H__ -#define __COM_VECTORBLURNODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class VectorBlurNode : public Node { VectorBlurNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_VectorCurveNode.h b/source/blender/compositor/nodes/COM_VectorCurveNode.h index 14bea25cf8d..4d7f92897a1 100644 --- a/source/blender/compositor/nodes/COM_VectorCurveNode.h +++ b/source/blender/compositor/nodes/COM_VectorCurveNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_VECTORCURVENODE_H__ -#define __COM_VECTORCURVENODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class VectorCurveNode : public Node { VectorCurveNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_ViewLevelsNode.h b/source/blender/compositor/nodes/COM_ViewLevelsNode.h index 851b1ecbd78..0e931fed055 100644 --- a/source/blender/compositor/nodes/COM_ViewLevelsNode.h +++ b/source/blender/compositor/nodes/COM_ViewLevelsNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_VIEWLEVELSNODE_H__ -#define __COM_VIEWLEVELSNODE_H__ +#pragma once #include "COM_Node.h" @@ -30,5 +29,3 @@ class ViewLevelsNode : public Node { ViewLevelsNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/nodes/COM_ViewerNode.h b/source/blender/compositor/nodes/COM_ViewerNode.h index 6168623e69c..74758417014 100644 --- a/source/blender/compositor/nodes/COM_ViewerNode.h +++ b/source/blender/compositor/nodes/COM_ViewerNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_VIEWERNODE_H__ -#define __COM_VIEWERNODE_H__ +#pragma once #include "COM_Node.h" #include "DNA_node_types.h" @@ -30,4 +29,3 @@ class ViewerNode : public Node { ViewerNode(bNode *editorNode); void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; -#endif diff --git a/source/blender/compositor/nodes/COM_ZCombineNode.h b/source/blender/compositor/nodes/COM_ZCombineNode.h index 95e81ca8c8f..ca54fd7fffa 100644 --- a/source/blender/compositor/nodes/COM_ZCombineNode.h +++ b/source/blender/compositor/nodes/COM_ZCombineNode.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_ZCOMBINENODE_H__ -#define __COM_ZCOMBINENODE_H__ +#pragma once #include "COM_Node.h" @@ -32,5 +31,3 @@ class ZCombineNode : public Node { } void convertToOperations(NodeConverter &converter, const CompositorContext &context) const; }; - -#endif diff --git a/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h b/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h index a4475bc2fbc..de3d6bd1ee0 100644 --- a/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h +++ b/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_ALPHAOVERKEYOPERATION_H__ -#define __COM_ALPHAOVERKEYOPERATION_H__ +#pragma once + #include "COM_MixOperation.h" /** @@ -36,4 +36,3 @@ class AlphaOverKeyOperation : public MixBaseOperation { */ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); }; -#endif diff --git a/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h b/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h index 88fa3d963f4..22d64807512 100644 --- a/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h +++ b/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_ALPHAOVERMIXEDOPERATION_H__ -#define __COM_ALPHAOVERMIXEDOPERATION_H__ +#pragma once + #include "COM_MixOperation.h" /** @@ -44,4 +44,3 @@ class AlphaOverMixedOperation : public MixBaseOperation { this->m_x = x; } }; -#endif diff --git a/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h b/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h index 4ef5f9d996e..bc5cd07baf8 100644 --- a/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h +++ b/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_ALPHAOVERPREMULTIPLYOPERATION_H__ -#define __COM_ALPHAOVERPREMULTIPLYOPERATION_H__ +#pragma once + #include "COM_MixOperation.h" /** @@ -36,4 +36,3 @@ class AlphaOverPremultiplyOperation : public MixBaseOperation { */ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); }; -#endif diff --git a/source/blender/compositor/operations/COM_AntiAliasOperation.h b/source/blender/compositor/operations/COM_AntiAliasOperation.h index 6141fb92c3f..8600c6dd481 100644 --- a/source/blender/compositor/operations/COM_AntiAliasOperation.h +++ b/source/blender/compositor/operations/COM_AntiAliasOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_ANTIALIASOPERATION_H__ -#define __COM_ANTIALIASOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" #include "DNA_node_types.h" @@ -56,4 +56,3 @@ class AntiAliasOperation : public NodeOperation { ReadBufferOperation *readOperation, rcti *output); }; -#endif diff --git a/source/blender/compositor/operations/COM_BilateralBlurOperation.h b/source/blender/compositor/operations/COM_BilateralBlurOperation.h index c3482005d8c..a54e830459b 100644 --- a/source/blender/compositor/operations/COM_BilateralBlurOperation.h +++ b/source/blender/compositor/operations/COM_BilateralBlurOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_BILATERALBLUROPERATION_H__ -#define __COM_BILATERALBLUROPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" #include "COM_QualityStepHelper.h" @@ -55,4 +55,3 @@ class BilateralBlurOperation : public NodeOperation, public QualityStepHelper { this->m_data = data; } }; -#endif diff --git a/source/blender/compositor/operations/COM_BlurBaseOperation.h b/source/blender/compositor/operations/COM_BlurBaseOperation.h index 07893c19126..e4ac8b3c874 100644 --- a/source/blender/compositor/operations/COM_BlurBaseOperation.h +++ b/source/blender/compositor/operations/COM_BlurBaseOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_BLURBASEOPERATION_H__ -#define __COM_BLURBASEOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" #include "COM_QualityStepHelper.h" @@ -77,4 +77,3 @@ class BlurBaseOperation : public NodeOperation, public QualityStepHelper { void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]); }; -#endif diff --git a/source/blender/compositor/operations/COM_BokehBlurOperation.h b/source/blender/compositor/operations/COM_BokehBlurOperation.h index 4f594f16cb4..e6873a4b70b 100644 --- a/source/blender/compositor/operations/COM_BokehBlurOperation.h +++ b/source/blender/compositor/operations/COM_BokehBlurOperation.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_BOKEHBLUROPERATION_H__ -#define __COM_BOKEHBLUROPERATION_H__ +#pragma once #include "COM_NodeOperation.h" #include "COM_QualityStepHelper.h" @@ -78,4 +77,3 @@ class BokehBlurOperation : public NodeOperation, public QualityStepHelper { void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]); }; -#endif diff --git a/source/blender/compositor/operations/COM_BokehImageOperation.h b/source/blender/compositor/operations/COM_BokehImageOperation.h index e907559d6e7..db1d3976d44 100644 --- a/source/blender/compositor/operations/COM_BokehImageOperation.h +++ b/source/blender/compositor/operations/COM_BokehImageOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_BOKEHIMAGEOPERATION_H__ -#define __COM_BOKEHIMAGEOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" /** @@ -149,4 +149,3 @@ class BokehImageOperation : public NodeOperation { this->m_deleteData = true; } }; -#endif diff --git a/source/blender/compositor/operations/COM_BoxMaskOperation.h b/source/blender/compositor/operations/COM_BoxMaskOperation.h index f770922ee7c..070a7f52b1b 100644 --- a/source/blender/compositor/operations/COM_BoxMaskOperation.h +++ b/source/blender/compositor/operations/COM_BoxMaskOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_BOXMASKOPERATION_H__ -#define __COM_BOXMASKOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" class BoxMaskOperation : public NodeOperation { @@ -63,4 +63,3 @@ class BoxMaskOperation : public NodeOperation { this->m_maskType = maskType; } }; -#endif diff --git a/source/blender/compositor/operations/COM_BrightnessOperation.h b/source/blender/compositor/operations/COM_BrightnessOperation.h index df6b3ef7b6e..28bd3576201 100644 --- a/source/blender/compositor/operations/COM_BrightnessOperation.h +++ b/source/blender/compositor/operations/COM_BrightnessOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_BRIGHTNESSOPERATION_H__ -#define __COM_BRIGHTNESSOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" class BrightnessOperation : public NodeOperation { @@ -51,4 +51,3 @@ class BrightnessOperation : public NodeOperation { void setUsePremultiply(bool use_premultiply); }; -#endif diff --git a/source/blender/compositor/operations/COM_CalculateMeanOperation.h b/source/blender/compositor/operations/COM_CalculateMeanOperation.h index 38d68b2a6fd..aa08555467b 100644 --- a/source/blender/compositor/operations/COM_CalculateMeanOperation.h +++ b/source/blender/compositor/operations/COM_CalculateMeanOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_CALCULATEMEANOPERATION_H__ -#define __COM_CALCULATEMEANOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" #include "DNA_node_types.h" @@ -67,4 +67,3 @@ class CalculateMeanOperation : public NodeOperation { protected: void calculateMean(MemoryBuffer *tile); }; -#endif diff --git a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h index 377276777f0..2ab0e82728d 100644 --- a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h +++ b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_CALCULATESTANDARDDEVIATIONOPERATION_H__ -#define __COM_CALCULATESTANDARDDEVIATIONOPERATION_H__ +#pragma once + #include "COM_CalculateMeanOperation.h" #include "COM_NodeOperation.h" #include "DNA_node_types.h" @@ -40,4 +40,3 @@ class CalculateStandardDeviationOperation : public CalculateMeanOperation { void *initializeTileData(rcti *rect); }; -#endif diff --git a/source/blender/compositor/operations/COM_ChangeHSVOperation.h b/source/blender/compositor/operations/COM_ChangeHSVOperation.h index 3898345f922..b4fa1a3bdd4 100644 --- a/source/blender/compositor/operations/COM_ChangeHSVOperation.h +++ b/source/blender/compositor/operations/COM_ChangeHSVOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_CHANGEHSVOPERATION_H__ -#define __COM_CHANGEHSVOPERATION_H__ +#pragma once + #include "COM_MixOperation.h" /** @@ -45,4 +45,3 @@ class ChangeHSVOperation : public NodeOperation { */ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); }; -#endif diff --git a/source/blender/compositor/operations/COM_ChannelMatteOperation.h b/source/blender/compositor/operations/COM_ChannelMatteOperation.h index ad88b41cc91..d4c097fe66e 100644 --- a/source/blender/compositor/operations/COM_ChannelMatteOperation.h +++ b/source/blender/compositor/operations/COM_ChannelMatteOperation.h @@ -16,8 +16,8 @@ * Copyright 2012, Blender Foundation. */ -#ifndef __COM_CHANNELMATTEOPERATION_H__ -#define __COM_CHANNELMATTEOPERATION_H__ +#pragma once + #include "COM_MixOperation.h" /** @@ -70,4 +70,3 @@ class ChannelMatteOperation : public NodeOperation { this->m_matte_channel = custom2; } }; -#endif diff --git a/source/blender/compositor/operations/COM_ChromaMatteOperation.h b/source/blender/compositor/operations/COM_ChromaMatteOperation.h index 58da839823d..5c4ada8de38 100644 --- a/source/blender/compositor/operations/COM_ChromaMatteOperation.h +++ b/source/blender/compositor/operations/COM_ChromaMatteOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_CHROMAMATTEOPERATION_H__ -#define __COM_CHROMAMATTEOPERATION_H__ +#pragma once + #include "COM_MixOperation.h" /** @@ -49,4 +49,3 @@ class ChromaMatteOperation : public NodeOperation { this->m_settings = nodeChroma; } }; -#endif diff --git a/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h b/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h index fd1d51a293b..77ead2f1d26 100644 --- a/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h +++ b/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_COLORBALANCEASCCDLOPERATION_H__ -#define __COM_COLORBALANCEASCCDLOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" /** @@ -70,4 +70,3 @@ class ColorBalanceASCCDLOperation : public NodeOperation { copy_v3_v3(this->m_slope, slope); } }; -#endif diff --git a/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h b/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h index a2d4b4cd13a..c34591172b9 100644 --- a/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h +++ b/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_COLORBALANCELGGOPERATION_H__ -#define __COM_COLORBALANCELGGOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" /** @@ -70,4 +70,3 @@ class ColorBalanceLGGOperation : public NodeOperation { copy_v3_v3(this->m_gamma_inv, gamma_inv); } }; -#endif diff --git a/source/blender/compositor/operations/COM_ColorCorrectionOperation.h b/source/blender/compositor/operations/COM_ColorCorrectionOperation.h index ec9632acc7c..66213eb88a4 100644 --- a/source/blender/compositor/operations/COM_ColorCorrectionOperation.h +++ b/source/blender/compositor/operations/COM_ColorCorrectionOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_COLORCORRECTIONOPERATION_H__ -#define __COM_COLORCORRECTIONOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" class ColorCorrectionOperation : public NodeOperation { @@ -68,4 +68,3 @@ class ColorCorrectionOperation : public NodeOperation { this->m_blueChannelEnabled = enabled; } }; -#endif diff --git a/source/blender/compositor/operations/COM_ColorCurveOperation.h b/source/blender/compositor/operations/COM_ColorCurveOperation.h index 7869d1c4a56..65a822508b8 100644 --- a/source/blender/compositor/operations/COM_ColorCurveOperation.h +++ b/source/blender/compositor/operations/COM_ColorCurveOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_COLORCURVEOPERATION_H__ -#define __COM_COLORCURVEOPERATION_H__ +#pragma once + #include "COM_CurveBaseOperation.h" #include "COM_NodeOperation.h" #include "DNA_color_types.h" @@ -88,5 +88,3 @@ class ConstantLevelColorCurveOperation : public CurveBaseOperation { copy_v3_v3(this->m_white, white); } }; - -#endif diff --git a/source/blender/compositor/operations/COM_ColorMatteOperation.h b/source/blender/compositor/operations/COM_ColorMatteOperation.h index 7e8a0e295e1..bb00c344606 100644 --- a/source/blender/compositor/operations/COM_ColorMatteOperation.h +++ b/source/blender/compositor/operations/COM_ColorMatteOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_COLORMATTEOPERATION_H__ -#define __COM_COLORMATTEOPERATION_H__ +#pragma once + #include "COM_MixOperation.h" /** @@ -49,4 +49,3 @@ class ColorMatteOperation : public NodeOperation { this->m_settings = nodeChroma; } }; -#endif diff --git a/source/blender/compositor/operations/COM_ColorRampOperation.h b/source/blender/compositor/operations/COM_ColorRampOperation.h index 3e2acda1d10..b4253a3f074 100644 --- a/source/blender/compositor/operations/COM_ColorRampOperation.h +++ b/source/blender/compositor/operations/COM_ColorRampOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_COLORRAMPOPERATION_H__ -#define __COM_COLORRAMPOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" #include "DNA_texture_types.h" @@ -52,4 +52,3 @@ class ColorRampOperation : public NodeOperation { this->m_colorBand = colorBand; } }; -#endif diff --git a/source/blender/compositor/operations/COM_ColorSpillOperation.h b/source/blender/compositor/operations/COM_ColorSpillOperation.h index 73f4f5b045d..560d198693f 100644 --- a/source/blender/compositor/operations/COM_ColorSpillOperation.h +++ b/source/blender/compositor/operations/COM_ColorSpillOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_COLORSPILLOPERATION_H__ -#define __COM_COLORSPILLOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" /** @@ -64,5 +64,3 @@ class ColorSpillOperation : public NodeOperation { float calculateMapValue(float fac, float *input); }; - -#endif diff --git a/source/blender/compositor/operations/COM_CompositorOperation.h b/source/blender/compositor/operations/COM_CompositorOperation.h index 8db8fe00d3c..3633bfd511c 100644 --- a/source/blender/compositor/operations/COM_CompositorOperation.h +++ b/source/blender/compositor/operations/COM_CompositorOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_COMPOSITOROPERATION_H__ -#define __COM_COMPOSITOROPERATION_H__ +#pragma once + #include "BLI_rect.h" #include "BLI_string.h" #include "COM_NodeOperation.h" @@ -123,4 +123,3 @@ class CompositorOperation : public NodeOperation { this->m_active = active; } }; -#endif diff --git a/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h b/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h index 7cc39a47dd0..8fce5ef3e1a 100644 --- a/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h +++ b/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_CONVERTCOLORPROFILEOPERATION_H__ -#define __COM_CONVERTCOLORPROFILEOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" /** @@ -80,4 +80,3 @@ class ConvertColorProfileOperation : public NodeOperation { this->m_predivided = predivided; } }; -#endif diff --git a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h index 7c3e0ed9738..3babcfe4dc3 100644 --- a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h +++ b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_CONVERTDEPTHTORADIUSOPERATION_H__ -#define __COM_CONVERTDEPTHTORADIUSOPERATION_H__ +#pragma once + #include "COM_FastGaussianBlurOperation.h" #include "COM_NodeOperation.h" #include "DNA_object_types.h" @@ -81,4 +81,3 @@ class ConvertDepthToRadiusOperation : public NodeOperation { this->m_blurPostOperation = operation; } }; -#endif diff --git a/source/blender/compositor/operations/COM_ConvertOperation.h b/source/blender/compositor/operations/COM_ConvertOperation.h index a4cf05372a5..ca026528a38 100644 --- a/source/blender/compositor/operations/COM_ConvertOperation.h +++ b/source/blender/compositor/operations/COM_ConvertOperation.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_CONVERTOPERATION_H__ -#define __COM_CONVERTOPERATION_H__ +#pragma once #include "COM_NodeOperation.h" @@ -183,5 +182,3 @@ class CombineChannelsOperation : public NodeOperation { void initExecution(); void deinitExecution(); }; - -#endif diff --git a/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h b/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h index 17509b018bf..ab4b8a1dad1 100644 --- a/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h +++ b/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_CONVOLUTIONEDGEFILTEROPERATION_H__ -#define __COM_CONVOLUTIONEDGEFILTEROPERATION_H__ +#pragma once #include "COM_ConvolutionFilterOperation.h" @@ -26,5 +25,3 @@ class ConvolutionEdgeFilterOperation : public ConvolutionFilterOperation { ConvolutionEdgeFilterOperation(); void executePixel(float output[4], int x, int y, void *data); }; - -#endif diff --git a/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h b/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h index 78db5a5ae9d..d178b0a7418 100644 --- a/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h +++ b/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_CONVOLUTIONFILTEROPERATION_H__ -#define __COM_CONVOLUTIONFILTEROPERATION_H__ +#pragma once #include "COM_NodeOperation.h" @@ -43,5 +42,3 @@ class ConvolutionFilterOperation : public NodeOperation { void initExecution(); void deinitExecution(); }; - -#endif diff --git a/source/blender/compositor/operations/COM_CropOperation.h b/source/blender/compositor/operations/COM_CropOperation.h index 36c18d29e92..f20664f0501 100644 --- a/source/blender/compositor/operations/COM_CropOperation.h +++ b/source/blender/compositor/operations/COM_CropOperation.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_CROPOPERATION_H__ -#define __COM_CROPOPERATION_H__ +#pragma once #include "COM_NodeOperation.h" @@ -64,4 +63,3 @@ class CropImageOperation : public CropBaseOperation { void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]); void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); }; -#endif diff --git a/source/blender/compositor/operations/COM_CryptomatteOperation.h b/source/blender/compositor/operations/COM_CryptomatteOperation.h index 459d8b65f12..8c5a3134720 100644 --- a/source/blender/compositor/operations/COM_CryptomatteOperation.h +++ b/source/blender/compositor/operations/COM_CryptomatteOperation.h @@ -16,8 +16,8 @@ * Copyright 2018, Blender Foundation. */ -#ifndef __COM_CRYPTOMATTEOPERATION_H__ -#define __COM_CRYPTOMATTEOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" class CryptomatteOperation : public NodeOperation { @@ -34,4 +34,3 @@ class CryptomatteOperation : public NodeOperation { void addObjectIndex(float objectIndex); }; -#endif diff --git a/source/blender/compositor/operations/COM_CurveBaseOperation.h b/source/blender/compositor/operations/COM_CurveBaseOperation.h index f42ce3c366f..63e667cfe12 100644 --- a/source/blender/compositor/operations/COM_CurveBaseOperation.h +++ b/source/blender/compositor/operations/COM_CurveBaseOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_CURVEBASEOPERATION_H__ -#define __COM_CURVEBASEOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" #include "DNA_color_types.h" @@ -40,4 +40,3 @@ class CurveBaseOperation : public NodeOperation { void setCurveMapping(CurveMapping *mapping); }; -#endif diff --git a/source/blender/compositor/operations/COM_DenoiseOperation.h b/source/blender/compositor/operations/COM_DenoiseOperation.h index 6a53eead65c..5af6e16c958 100644 --- a/source/blender/compositor/operations/COM_DenoiseOperation.h +++ b/source/blender/compositor/operations/COM_DenoiseOperation.h @@ -16,8 +16,7 @@ * Copyright 2019, Blender Foundation. */ -#ifndef __COM_DENOISEOPERATION_H__ -#define __COM_DENOISEOPERATION_H__ +#pragma once #include "COM_SingleThreadedOperation.h" #include "DNA_node_types.h" @@ -65,5 +64,3 @@ class DenoiseOperation : public SingleThreadedOperation { MemoryBuffer *createMemoryBuffer(rcti *rect); }; - -#endif /* __COM_DENOISEOPERATION_H__ */ diff --git a/source/blender/compositor/operations/COM_DespeckleOperation.h b/source/blender/compositor/operations/COM_DespeckleOperation.h index 280948b7fbe..af37c276bd2 100644 --- a/source/blender/compositor/operations/COM_DespeckleOperation.h +++ b/source/blender/compositor/operations/COM_DespeckleOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_DESPECKLEOPERATION_H__ -#define __COM_DESPECKLEOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" class DespeckleOperation : public NodeOperation { @@ -51,5 +51,3 @@ class DespeckleOperation : public NodeOperation { void initExecution(); void deinitExecution(); }; - -#endif diff --git a/source/blender/compositor/operations/COM_DifferenceMatteOperation.h b/source/blender/compositor/operations/COM_DifferenceMatteOperation.h index e96e212e511..beaa4400712 100644 --- a/source/blender/compositor/operations/COM_DifferenceMatteOperation.h +++ b/source/blender/compositor/operations/COM_DifferenceMatteOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_DIFFERENCEMATTEOPERATION_H__ -#define __COM_DIFFERENCEMATTEOPERATION_H__ +#pragma once + #include "COM_MixOperation.h" /** @@ -49,4 +49,3 @@ class DifferenceMatteOperation : public NodeOperation { this->m_settings = nodeChroma; } }; -#endif diff --git a/source/blender/compositor/operations/COM_DilateErodeOperation.h b/source/blender/compositor/operations/COM_DilateErodeOperation.h index bd7e0938c58..95a799ab648 100644 --- a/source/blender/compositor/operations/COM_DilateErodeOperation.h +++ b/source/blender/compositor/operations/COM_DilateErodeOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_DILATEERODEOPERATION_H__ -#define __COM_DILATEERODEOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" class DilateErodeThresholdOperation : public NodeOperation { @@ -180,5 +180,3 @@ class ErodeStepOperation : public DilateStepOperation { void *initializeTileData(rcti *rect); }; - -#endif diff --git a/source/blender/compositor/operations/COM_DirectionalBlurOperation.h b/source/blender/compositor/operations/COM_DirectionalBlurOperation.h index f8b7bab010b..57fc0bb7fa3 100644 --- a/source/blender/compositor/operations/COM_DirectionalBlurOperation.h +++ b/source/blender/compositor/operations/COM_DirectionalBlurOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_DIRECTIONALBLUROPERATION_H__ -#define __COM_DIRECTIONALBLUROPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" #include "COM_QualityStepHelper.h" @@ -64,4 +64,3 @@ class DirectionalBlurOperation : public NodeOperation, public QualityStepHelper list *clMemToCleanUp, list *clKernelsToCleanUp); }; -#endif diff --git a/source/blender/compositor/operations/COM_DisplaceOperation.h b/source/blender/compositor/operations/COM_DisplaceOperation.h index 4e44572fcf2..ee06bf320a6 100644 --- a/source/blender/compositor/operations/COM_DisplaceOperation.h +++ b/source/blender/compositor/operations/COM_DisplaceOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_DISPLACEOPERATION_H__ -#define __COM_DISPLACEOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" class DisplaceOperation : public NodeOperation { @@ -64,4 +64,3 @@ class DisplaceOperation : public NodeOperation { bool read_displacement( float x, float y, float xscale, float yscale, const float origin[2], float &r_u, float &r_v); }; -#endif diff --git a/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h b/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h index 6d4d6047137..6930985b0e5 100644 --- a/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h +++ b/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h @@ -16,8 +16,8 @@ * Copyright 2012, Blender Foundation. */ -#ifndef __COM_DISPLACESIMPLEOPERATION_H__ -#define __COM_DISPLACESIMPLEOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" class DisplaceSimpleOperation : public NodeOperation { @@ -58,4 +58,3 @@ class DisplaceSimpleOperation : public NodeOperation { */ void deinitExecution(); }; -#endif diff --git a/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.h b/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.h index c64c6da8d24..d99ab262c18 100644 --- a/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.h +++ b/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_DISTANCERGBMATTEOPERATION_H__ -#define __COM_DISTANCERGBMATTEOPERATION_H__ +#pragma once + #include "COM_MixOperation.h" /** @@ -51,4 +51,3 @@ class DistanceRGBMatteOperation : public NodeOperation { this->m_settings = nodeChroma; } }; -#endif diff --git a/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h b/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h index 1cb477bc05d..e9b2cda6251 100644 --- a/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h +++ b/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_DISTANCEYCCMATTEOPERATION_H__ -#define __COM_DISTANCEYCCMATTEOPERATION_H__ +#pragma once + #include "COM_DistanceRGBMatteOperation.h" #include "COM_MixOperation.h" @@ -35,4 +35,3 @@ class DistanceYCCMatteOperation : public DistanceRGBMatteOperation { */ DistanceYCCMatteOperation(); }; -#endif diff --git a/source/blender/compositor/operations/COM_DotproductOperation.h b/source/blender/compositor/operations/COM_DotproductOperation.h index 9ef9753f4c9..63b735ce30f 100644 --- a/source/blender/compositor/operations/COM_DotproductOperation.h +++ b/source/blender/compositor/operations/COM_DotproductOperation.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_DOTPRODUCTOPERATION_H__ -#define __COM_DOTPRODUCTOPERATION_H__ +#pragma once #include "COM_NodeOperation.h" @@ -33,5 +32,3 @@ class DotproductOperation : public NodeOperation { void initExecution(); void deinitExecution(); }; - -#endif diff --git a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h index 40cfa370cb7..0c77e83daec 100644 --- a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h +++ b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_DOUBLEEDGEMASKOPERATION_H__ -#define __COM_DOUBLEEDGEMASKOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" class DoubleEdgeMaskOperation : public NodeOperation { @@ -65,4 +65,3 @@ class DoubleEdgeMaskOperation : public NodeOperation { this->m_keepInside = keepInside; } }; -#endif diff --git a/source/blender/compositor/operations/COM_EllipseMaskOperation.h b/source/blender/compositor/operations/COM_EllipseMaskOperation.h index b73a35a5452..2e6b1f782a1 100644 --- a/source/blender/compositor/operations/COM_EllipseMaskOperation.h +++ b/source/blender/compositor/operations/COM_EllipseMaskOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_ELLIPSEMASKOPERATION_H__ -#define __COM_ELLIPSEMASKOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" class EllipseMaskOperation : public NodeOperation { @@ -63,4 +63,3 @@ class EllipseMaskOperation : public NodeOperation { this->m_maskType = maskType; } }; -#endif diff --git a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h index 22f9a6f9cf2..6ab6474c20a 100644 --- a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h +++ b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_FASTGAUSSIANBLUROPERATION_H__ -#define __COM_FASTGAUSSIANBLUROPERATION_H__ +#pragma once #include "COM_BlurBaseOperation.h" #include "DNA_node_types.h" @@ -80,5 +79,3 @@ class FastGaussianBlurValueOperation : public NodeOperation { this->m_overlay = overlay; } }; - -#endif diff --git a/source/blender/compositor/operations/COM_FlipOperation.h b/source/blender/compositor/operations/COM_FlipOperation.h index 2d00c50dc8a..711b51261e6 100644 --- a/source/blender/compositor/operations/COM_FlipOperation.h +++ b/source/blender/compositor/operations/COM_FlipOperation.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_FLIPOPERATION_H__ -#define __COM_FLIPOPERATION_H__ +#pragma once #include "COM_NodeOperation.h" @@ -45,5 +44,3 @@ class FlipOperation : public NodeOperation { this->m_flipY = flipY; } }; - -#endif diff --git a/source/blender/compositor/operations/COM_GammaCorrectOperation.h b/source/blender/compositor/operations/COM_GammaCorrectOperation.h index 26e31df880f..be57e279ac8 100644 --- a/source/blender/compositor/operations/COM_GammaCorrectOperation.h +++ b/source/blender/compositor/operations/COM_GammaCorrectOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_GAMMACORRECTOPERATION_H__ -#define __COM_GAMMACORRECTOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" class GammaCorrectOperation : public NodeOperation { @@ -71,5 +71,3 @@ class GammaUncorrectOperation : public NodeOperation { */ void deinitExecution(); }; - -#endif diff --git a/source/blender/compositor/operations/COM_GammaOperation.h b/source/blender/compositor/operations/COM_GammaOperation.h index ba0b84db931..493fdb1f889 100644 --- a/source/blender/compositor/operations/COM_GammaOperation.h +++ b/source/blender/compositor/operations/COM_GammaOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_GAMMAOPERATION_H__ -#define __COM_GAMMAOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" class GammaOperation : public NodeOperation { @@ -46,4 +46,3 @@ class GammaOperation : public NodeOperation { */ void deinitExecution(); }; -#endif diff --git a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h index 9de75ff53a7..a8e1ddfb885 100644 --- a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h +++ b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_GAUSSIANALPHAXBLUROPERATION_H__ -#define __COM_GAUSSIANALPHAXBLUROPERATION_H__ +#pragma once + #include "COM_BlurBaseOperation.h" #include "COM_NodeOperation.h" @@ -65,4 +65,3 @@ class GaussianAlphaXBlurOperation : public BlurBaseOperation { this->m_falloff = falloff; } }; -#endif diff --git a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h index 44689922bfc..df34f15fccc 100644 --- a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h +++ b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_GAUSSIANALPHAYBLUROPERATION_H__ -#define __COM_GAUSSIANALPHAYBLUROPERATION_H__ +#pragma once + #include "COM_BlurBaseOperation.h" #include "COM_NodeOperation.h" @@ -65,4 +65,3 @@ class GaussianAlphaYBlurOperation : public BlurBaseOperation { this->m_falloff = falloff; } }; -#endif diff --git a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h index 3aa380853bd..b4b5c0e8b2f 100644 --- a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h +++ b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_GAUSSIANBOKEHBLUROPERATION_H__ -#define __COM_GAUSSIANBOKEHBLUROPERATION_H__ +#pragma once + #include "COM_BlurBaseOperation.h" #include "COM_NodeOperation.h" #include "COM_QualityStepHelper.h" @@ -75,5 +75,3 @@ class GaussianBlurReferenceOperation : public BlurBaseOperation { ReadBufferOperation *readOperation, rcti *output); }; - -#endif diff --git a/source/blender/compositor/operations/COM_GaussianXBlurOperation.h b/source/blender/compositor/operations/COM_GaussianXBlurOperation.h index c5c08df8ce7..1bd6ef20a48 100644 --- a/source/blender/compositor/operations/COM_GaussianXBlurOperation.h +++ b/source/blender/compositor/operations/COM_GaussianXBlurOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_GAUSSIANXBLUROPERATION_H__ -#define __COM_GAUSSIANXBLUROPERATION_H__ +#pragma once + #include "COM_BlurBaseOperation.h" #include "COM_NodeOperation.h" @@ -65,4 +65,3 @@ class GaussianXBlurOperation : public BlurBaseOperation { this->setOpenCL(m_data.sizex >= 128); } }; -#endif diff --git a/source/blender/compositor/operations/COM_GaussianYBlurOperation.h b/source/blender/compositor/operations/COM_GaussianYBlurOperation.h index 92154aa7518..a9af28791f8 100644 --- a/source/blender/compositor/operations/COM_GaussianYBlurOperation.h +++ b/source/blender/compositor/operations/COM_GaussianYBlurOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_GAUSSIANYBLUROPERATION_H__ -#define __COM_GAUSSIANYBLUROPERATION_H__ +#pragma once + #include "COM_BlurBaseOperation.h" #include "COM_NodeOperation.h" @@ -65,4 +65,3 @@ class GaussianYBlurOperation : public BlurBaseOperation { this->setOpenCL(m_data.sizex >= 128); } }; -#endif diff --git a/source/blender/compositor/operations/COM_GlareBaseOperation.h b/source/blender/compositor/operations/COM_GlareBaseOperation.h index ba2b9a8f4b8..aabb76f5cf0 100644 --- a/source/blender/compositor/operations/COM_GlareBaseOperation.h +++ b/source/blender/compositor/operations/COM_GlareBaseOperation.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_GLAREBASEOPERATION_H__ -#define __COM_GLAREBASEOPERATION_H__ +#pragma once #include "COM_SingleThreadedOperation.h" #include "DNA_node_types.h" @@ -74,4 +73,3 @@ class GlareBaseOperation : public SingleThreadedOperation { MemoryBuffer *createMemoryBuffer(rcti *rect); }; -#endif diff --git a/source/blender/compositor/operations/COM_GlareFogGlowOperation.h b/source/blender/compositor/operations/COM_GlareFogGlowOperation.h index dae0b714e56..9084f27052e 100644 --- a/source/blender/compositor/operations/COM_GlareFogGlowOperation.h +++ b/source/blender/compositor/operations/COM_GlareFogGlowOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_GLAREFOGGLOWOPERATION_H__ -#define __COM_GLAREFOGGLOWOPERATION_H__ +#pragma once + #include "COM_GlareBaseOperation.h" #include "COM_NodeOperation.h" #include "DNA_node_types.h" @@ -31,4 +31,3 @@ class GlareFogGlowOperation : public GlareBaseOperation { protected: void generateGlare(float *data, MemoryBuffer *inputTile, NodeGlare *settings); }; -#endif diff --git a/source/blender/compositor/operations/COM_GlareGhostOperation.h b/source/blender/compositor/operations/COM_GlareGhostOperation.h index c0b41762c8a..8ecf8da3385 100644 --- a/source/blender/compositor/operations/COM_GlareGhostOperation.h +++ b/source/blender/compositor/operations/COM_GlareGhostOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_GLAREGHOSTOPERATION_H__ -#define __COM_GLAREGHOSTOPERATION_H__ +#pragma once + #include "COM_GlareBaseOperation.h" #include "COM_NodeOperation.h" #include "DNA_node_types.h" @@ -31,4 +31,3 @@ class GlareGhostOperation : public GlareBaseOperation { protected: void generateGlare(float *data, MemoryBuffer *inputTile, NodeGlare *settings); }; -#endif diff --git a/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h b/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h index b6e2e499f64..0f5913fcef9 100644 --- a/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h +++ b/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_GLARESIMPLESTAROPERATION_H__ -#define __COM_GLARESIMPLESTAROPERATION_H__ +#pragma once + #include "COM_GlareBaseOperation.h" #include "COM_NodeOperation.h" #include "DNA_node_types.h" @@ -31,4 +31,3 @@ class GlareSimpleStarOperation : public GlareBaseOperation { protected: void generateGlare(float *data, MemoryBuffer *inputTile, NodeGlare *settings); }; -#endif diff --git a/source/blender/compositor/operations/COM_GlareStreaksOperation.h b/source/blender/compositor/operations/COM_GlareStreaksOperation.h index 9f137f90b71..df31981170d 100644 --- a/source/blender/compositor/operations/COM_GlareStreaksOperation.h +++ b/source/blender/compositor/operations/COM_GlareStreaksOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_GLARESTREAKSOPERATION_H__ -#define __COM_GLARESTREAKSOPERATION_H__ +#pragma once + #include "COM_GlareBaseOperation.h" #include "COM_NodeOperation.h" #include "DNA_node_types.h" @@ -31,4 +31,3 @@ class GlareStreaksOperation : public GlareBaseOperation { protected: void generateGlare(float *data, MemoryBuffer *inputTile, NodeGlare *settings); }; -#endif diff --git a/source/blender/compositor/operations/COM_GlareThresholdOperation.h b/source/blender/compositor/operations/COM_GlareThresholdOperation.h index 385111cdf0b..e4ac36f2053 100644 --- a/source/blender/compositor/operations/COM_GlareThresholdOperation.h +++ b/source/blender/compositor/operations/COM_GlareThresholdOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_GLARETHRESHOLDOPERATION_H__ -#define __COM_GLARETHRESHOLDOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" #include "DNA_light_types.h" @@ -58,4 +58,3 @@ class GlareThresholdOperation : public NodeOperation { void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]); }; -#endif diff --git a/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h b/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h index 0624a5c022f..f29a932d7f8 100644 --- a/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h +++ b/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_HUESATURATIONVALUECORRECTOPERATION_H__ -#define __COM_HUESATURATIONVALUECORRECTOPERATION_H__ +#pragma once + #include "COM_CurveBaseOperation.h" #include "COM_NodeOperation.h" @@ -46,4 +46,3 @@ class HueSaturationValueCorrectOperation : public CurveBaseOperation { */ void deinitExecution(); }; -#endif diff --git a/source/blender/compositor/operations/COM_IDMaskOperation.h b/source/blender/compositor/operations/COM_IDMaskOperation.h index b3a40106b9d..abd2a719371 100644 --- a/source/blender/compositor/operations/COM_IDMaskOperation.h +++ b/source/blender/compositor/operations/COM_IDMaskOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_IDMASKOPERATION_H__ -#define __COM_IDMASKOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" class IDMaskOperation : public NodeOperation { @@ -35,4 +35,3 @@ class IDMaskOperation : public NodeOperation { this->m_objectIndex = objectIndex; } }; -#endif diff --git a/source/blender/compositor/operations/COM_ImageOperation.h b/source/blender/compositor/operations/COM_ImageOperation.h index 3e081ee0000..fcffdc7aae9 100644 --- a/source/blender/compositor/operations/COM_ImageOperation.h +++ b/source/blender/compositor/operations/COM_ImageOperation.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_IMAGEOPERATION_H__ -#define __COM_IMAGEOPERATION_H__ +#pragma once #include "BKE_image.h" #include "BLI_listbase.h" @@ -103,4 +102,3 @@ class ImageDepthOperation : public BaseImageOperation { ImageDepthOperation(); void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); }; -#endif diff --git a/source/blender/compositor/operations/COM_InpaintOperation.h b/source/blender/compositor/operations/COM_InpaintOperation.h index 2fef7c590ea..12523d5f064 100644 --- a/source/blender/compositor/operations/COM_InpaintOperation.h +++ b/source/blender/compositor/operations/COM_InpaintOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_INPAINTOPERATION_H__ -#define __COM_INPAINTOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" class InpaintSimpleOperation : public NodeOperation { @@ -72,5 +72,3 @@ class InpaintSimpleOperation : public NodeOperation { bool next_pixel(int &x, int &y, int &curr, int iters); void pix_step(int x, int y); }; - -#endif diff --git a/source/blender/compositor/operations/COM_InvertOperation.h b/source/blender/compositor/operations/COM_InvertOperation.h index 39161455a76..5399122ab62 100644 --- a/source/blender/compositor/operations/COM_InvertOperation.h +++ b/source/blender/compositor/operations/COM_InvertOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_INVERTOPERATION_H__ -#define __COM_INVERTOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" class InvertOperation : public NodeOperation { @@ -58,4 +58,3 @@ class InvertOperation : public NodeOperation { this->m_alpha = alpha; } }; -#endif diff --git a/source/blender/compositor/operations/COM_KeyingBlurOperation.h b/source/blender/compositor/operations/COM_KeyingBlurOperation.h index 0e45f1c32b8..6a2b43a6cd4 100644 --- a/source/blender/compositor/operations/COM_KeyingBlurOperation.h +++ b/source/blender/compositor/operations/COM_KeyingBlurOperation.h @@ -16,8 +16,7 @@ * Copyright 2012, Blender Foundation. */ -#ifndef __COM_KEYINGBLUROPERATION_H__ -#define __COM_KEYINGBLUROPERATION_H__ +#pragma once #include "COM_NodeOperation.h" @@ -54,5 +53,3 @@ class KeyingBlurOperation : public NodeOperation { ReadBufferOperation *readOperation, rcti *output); }; - -#endif diff --git a/source/blender/compositor/operations/COM_KeyingClipOperation.h b/source/blender/compositor/operations/COM_KeyingClipOperation.h index 8237c443cf2..9d876966e96 100644 --- a/source/blender/compositor/operations/COM_KeyingClipOperation.h +++ b/source/blender/compositor/operations/COM_KeyingClipOperation.h @@ -16,8 +16,7 @@ * Copyright 2012, Blender Foundation. */ -#ifndef __COM_KEYINGCLIPOPERATION_H__ -#define __COM_KEYINGCLIPOPERATION_H__ +#pragma once #include "COM_NodeOperation.h" @@ -68,5 +67,3 @@ class KeyingClipOperation : public NodeOperation { ReadBufferOperation *readOperation, rcti *output); }; - -#endif diff --git a/source/blender/compositor/operations/COM_KeyingDespillOperation.h b/source/blender/compositor/operations/COM_KeyingDespillOperation.h index eb43a478e50..32df7939c43 100644 --- a/source/blender/compositor/operations/COM_KeyingDespillOperation.h +++ b/source/blender/compositor/operations/COM_KeyingDespillOperation.h @@ -16,8 +16,7 @@ * Copyright 2012, Blender Foundation. */ -#ifndef __COM_KEYINGDESPILLOPERATION_H__ -#define __COM_KEYINGDESPILLOPERATION_H__ +#pragma once #include "COM_NodeOperation.h" @@ -48,5 +47,3 @@ class KeyingDespillOperation : public NodeOperation { void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); }; - -#endif diff --git a/source/blender/compositor/operations/COM_KeyingOperation.h b/source/blender/compositor/operations/COM_KeyingOperation.h index 81d23e76b2a..946d7bdc1f7 100644 --- a/source/blender/compositor/operations/COM_KeyingOperation.h +++ b/source/blender/compositor/operations/COM_KeyingOperation.h @@ -16,8 +16,7 @@ * Copyright 2012, Blender Foundation. */ -#ifndef __COM_KEYINGOPERATION_H__ -#define __COM_KEYINGOPERATION_H__ +#pragma once #include @@ -48,5 +47,3 @@ class KeyingOperation : public NodeOperation { void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); }; - -#endif diff --git a/source/blender/compositor/operations/COM_KeyingScreenOperation.h b/source/blender/compositor/operations/COM_KeyingScreenOperation.h index 593e902117b..595301bb951 100644 --- a/source/blender/compositor/operations/COM_KeyingScreenOperation.h +++ b/source/blender/compositor/operations/COM_KeyingScreenOperation.h @@ -16,8 +16,7 @@ * Copyright 2012, Blender Foundation. */ -#ifndef __COM_KEYINGSCREENOPERATION_H__ -#define __COM_KEYINGSCREENOPERATION_H__ +#pragma once #include @@ -83,5 +82,3 @@ class KeyingScreenOperation : public NodeOperation { void executePixel(float output[4], int x, int y, void *data); }; - -#endif diff --git a/source/blender/compositor/operations/COM_LuminanceMatteOperation.h b/source/blender/compositor/operations/COM_LuminanceMatteOperation.h index 2df7847f7ff..2b77b3cde85 100644 --- a/source/blender/compositor/operations/COM_LuminanceMatteOperation.h +++ b/source/blender/compositor/operations/COM_LuminanceMatteOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_LUMINANCEMATTEOPERATION_H__ -#define __COM_LUMINANCEMATTEOPERATION_H__ +#pragma once + #include "COM_MixOperation.h" /** @@ -48,4 +48,3 @@ class LuminanceMatteOperation : public NodeOperation { this->m_settings = nodeChroma; } }; -#endif diff --git a/source/blender/compositor/operations/COM_MapRangeOperation.h b/source/blender/compositor/operations/COM_MapRangeOperation.h index 55b5cc7453c..8656b5539a0 100644 --- a/source/blender/compositor/operations/COM_MapRangeOperation.h +++ b/source/blender/compositor/operations/COM_MapRangeOperation.h @@ -16,8 +16,8 @@ * Copyright 2012, Blender Foundation. */ -#ifndef __COM_MAPRANGEOPERATION_H__ -#define __COM_MAPRANGEOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" #include "DNA_texture_types.h" @@ -67,4 +67,3 @@ class MapRangeOperation : public NodeOperation { this->m_useClamp = value; } }; -#endif diff --git a/source/blender/compositor/operations/COM_MapUVOperation.h b/source/blender/compositor/operations/COM_MapUVOperation.h index 64e17b180b4..639b61847c4 100644 --- a/source/blender/compositor/operations/COM_MapUVOperation.h +++ b/source/blender/compositor/operations/COM_MapUVOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_MAPUVOPERATION_H__ -#define __COM_MAPUVOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" class MapUVOperation : public NodeOperation { @@ -65,5 +65,3 @@ class MapUVOperation : public NodeOperation { private: bool read_uv(float x, float y, float &r_u, float &r_v, float &r_alpha); }; - -#endif diff --git a/source/blender/compositor/operations/COM_MapValueOperation.h b/source/blender/compositor/operations/COM_MapValueOperation.h index 81071d78cd7..cdbc98bd2a5 100644 --- a/source/blender/compositor/operations/COM_MapValueOperation.h +++ b/source/blender/compositor/operations/COM_MapValueOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_MAPVALUEOPERATION_H__ -#define __COM_MAPVALUEOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" #include "DNA_texture_types.h" @@ -62,4 +62,3 @@ class MapValueOperation : public NodeOperation { this->m_settings = settings; } }; -#endif diff --git a/source/blender/compositor/operations/COM_MaskOperation.h b/source/blender/compositor/operations/COM_MaskOperation.h index 45363ea5220..eba14d10373 100644 --- a/source/blender/compositor/operations/COM_MaskOperation.h +++ b/source/blender/compositor/operations/COM_MaskOperation.h @@ -16,8 +16,7 @@ * Copyright 2012, Blender Foundation. */ -#ifndef __COM_MASKOPERATION_H__ -#define __COM_MASKOPERATION_H__ +#pragma once #include "BLI_listbase.h" #include "COM_NodeOperation.h" @@ -94,5 +93,3 @@ class MaskOperation : public NodeOperation { void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); }; - -#endif diff --git a/source/blender/compositor/operations/COM_MathBaseOperation.h b/source/blender/compositor/operations/COM_MathBaseOperation.h index 199b59d8649..f844f668f08 100644 --- a/source/blender/compositor/operations/COM_MathBaseOperation.h +++ b/source/blender/compositor/operations/COM_MathBaseOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_MATHBASEOPERATION_H__ -#define __COM_MATHBASEOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" /** @@ -372,4 +372,3 @@ class MathSmoothMaxOperation : public MathBaseOperation { } void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); }; -#endif diff --git a/source/blender/compositor/operations/COM_MixOperation.h b/source/blender/compositor/operations/COM_MixOperation.h index cea0e59b541..e597e8af63a 100644 --- a/source/blender/compositor/operations/COM_MixOperation.h +++ b/source/blender/compositor/operations/COM_MixOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_MIXOPERATION_H__ -#define __COM_MIXOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" /** @@ -193,5 +193,3 @@ class MixValueOperation : public MixBaseOperation { MixValueOperation(); void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); }; - -#endif diff --git a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h index 8a95293b470..449e5d01a37 100644 --- a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h +++ b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_MOVIECLIPATTRIBUTEOPERATION_H__ -#define __COM_MOVIECLIPATTRIBUTEOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" #include "DNA_movieclip_types.h" @@ -70,4 +70,3 @@ class MovieClipAttributeOperation : public NodeOperation { this->m_invert = invert; } }; -#endif diff --git a/source/blender/compositor/operations/COM_MovieClipOperation.h b/source/blender/compositor/operations/COM_MovieClipOperation.h index 7ae85eac25e..8897f85f77c 100644 --- a/source/blender/compositor/operations/COM_MovieClipOperation.h +++ b/source/blender/compositor/operations/COM_MovieClipOperation.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_MOVIECLIPOPERATION_H__ -#define __COM_MOVIECLIPOPERATION_H__ +#pragma once #include "BLI_listbase.h" #include "COM_NodeOperation.h" @@ -77,5 +76,3 @@ class MovieClipAlphaOperation : public MovieClipBaseOperation { MovieClipAlphaOperation(); void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); }; - -#endif diff --git a/source/blender/compositor/operations/COM_MovieDistortionOperation.h b/source/blender/compositor/operations/COM_MovieDistortionOperation.h index 799c6385a10..f11ce485f97 100644 --- a/source/blender/compositor/operations/COM_MovieDistortionOperation.h +++ b/source/blender/compositor/operations/COM_MovieDistortionOperation.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_MOVIEDISTORTIONOPERATION_H__ -#define __COM_MOVIEDISTORTIONOPERATION_H__ +#pragma once #include "COM_NodeOperation.h" #include "DNA_movieclip_types.h" @@ -58,5 +57,3 @@ class MovieDistortionOperation : public NodeOperation { ReadBufferOperation *readOperation, rcti *output); }; - -#endif diff --git a/source/blender/compositor/operations/COM_MultilayerImageOperation.h b/source/blender/compositor/operations/COM_MultilayerImageOperation.h index 10c475ced4d..adfcc975ade 100644 --- a/source/blender/compositor/operations/COM_MultilayerImageOperation.h +++ b/source/blender/compositor/operations/COM_MultilayerImageOperation.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_MULTILAYERIMAGEOPERATION_H__ -#define __COM_MULTILAYERIMAGEOPERATION_H__ +#pragma once #include "COM_ImageOperation.h" @@ -67,5 +66,3 @@ class MultilayerVectorOperation : public MultilayerBaseOperation { } void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); }; - -#endif diff --git a/source/blender/compositor/operations/COM_NormalizeOperation.h b/source/blender/compositor/operations/COM_NormalizeOperation.h index a38e79bb0ab..58c03e633e2 100644 --- a/source/blender/compositor/operations/COM_NormalizeOperation.h +++ b/source/blender/compositor/operations/COM_NormalizeOperation.h @@ -16,8 +16,8 @@ * Copyright 2012, Blender Foundation. */ -#ifndef __COM_NORMALIZEOPERATION_H__ -#define __COM_NORMALIZEOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" #include "DNA_node_types.h" @@ -63,5 +63,3 @@ class NormalizeOperation : public NodeOperation { ReadBufferOperation *readOperation, rcti *output); }; - -#endif diff --git a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h index 609448c0bcb..1deaf121173 100644 --- a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h +++ b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h @@ -16,8 +16,8 @@ * Copyright 2015, Blender Foundation. */ -#ifndef __COM_OUTPUTFILEMULTIVIEWOPERATION_H__ -#define __COM_OUTPUTFILEMULTIVIEWOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" #include "COM_OutputFileOperation.h" @@ -77,5 +77,3 @@ class OutputStereoOperation : public OutputSingleLayerOperation { void *get_handle(const char *filename); void deinitExecution(); }; - -#endif diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.h b/source/blender/compositor/operations/COM_OutputFileOperation.h index d00d1d0dc0d..b2454e17e3f 100644 --- a/source/blender/compositor/operations/COM_OutputFileOperation.h +++ b/source/blender/compositor/operations/COM_OutputFileOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_OUTPUTFILEOPERATION_H__ -#define __COM_OUTPUTFILEOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" #include "BLI_path_util.h" @@ -140,5 +140,3 @@ void free_exr_channels(void *exrhandle, const char *layerName, const DataType datatype); int get_datatype_size(DataType datatype); - -#endif diff --git a/source/blender/compositor/operations/COM_PixelateOperation.h b/source/blender/compositor/operations/COM_PixelateOperation.h index 86aab26ee00..c7595756d39 100644 --- a/source/blender/compositor/operations/COM_PixelateOperation.h +++ b/source/blender/compositor/operations/COM_PixelateOperation.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_PIXELATEOPERATION_H__ -#define __COM_PIXELATEOPERATION_H__ +#pragma once #include "COM_NodeOperation.h" @@ -61,5 +60,3 @@ class PixelateOperation : public NodeOperation { */ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); }; - -#endif diff --git a/source/blender/compositor/operations/COM_PlaneCornerPinOperation.h b/source/blender/compositor/operations/COM_PlaneCornerPinOperation.h index 444616e13f2..1e892465db8 100644 --- a/source/blender/compositor/operations/COM_PlaneCornerPinOperation.h +++ b/source/blender/compositor/operations/COM_PlaneCornerPinOperation.h @@ -15,8 +15,7 @@ * Copyright 2014, Blender Foundation. */ -#ifndef __COM_PLANECORNERPINOPERATION_H__ -#define __COM_PLANECORNERPINOPERATION_H__ +#pragma once #include @@ -59,5 +58,3 @@ class PlaneCornerPinWarpImageOperation : public PlaneDistortWarpImageOperation { ReadBufferOperation *readOperation, rcti *output); }; - -#endif diff --git a/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.h b/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.h index 35e7745cb5d..6cc9456c13f 100644 --- a/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.h +++ b/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.h @@ -16,8 +16,7 @@ * Copyright 2013, Blender Foundation. */ -#ifndef __COM_PLANEDISTORTCOMMONOPERATION_H__ -#define __COM_PLANEDISTORTCOMMONOPERATION_H__ +#pragma once #include @@ -97,5 +96,3 @@ class PlaneDistortMaskOperation : public NodeOperation { this->m_motion_blur_shutter = shutter; } }; - -#endif diff --git a/source/blender/compositor/operations/COM_PlaneTrackOperation.h b/source/blender/compositor/operations/COM_PlaneTrackOperation.h index 875c8ce8fa0..fc0a0873d5f 100644 --- a/source/blender/compositor/operations/COM_PlaneTrackOperation.h +++ b/source/blender/compositor/operations/COM_PlaneTrackOperation.h @@ -16,8 +16,7 @@ * Copyright 2013, Blender Foundation. */ -#ifndef __COM_PLANETRACKOPERATION_H__ -#define __COM_PLANETRACKOPERATION_H__ +#pragma once #include @@ -96,5 +95,3 @@ class PlaneTrackWarpImageOperation : public PlaneDistortWarpImageOperation, NodeOperation::determineResolution(temp, resolution); } }; - -#endif diff --git a/source/blender/compositor/operations/COM_PreviewOperation.h b/source/blender/compositor/operations/COM_PreviewOperation.h index f31bd533971..eca50c5cda4 100644 --- a/source/blender/compositor/operations/COM_PreviewOperation.h +++ b/source/blender/compositor/operations/COM_PreviewOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_PREVIEWOPERATION_H__ -#define __COM_PREVIEWOPERATION_H__ +#pragma once + #include "BKE_global.h" #include "BLI_rect.h" #include "COM_NodeOperation.h" @@ -61,4 +61,3 @@ class PreviewOperation : public NodeOperation { return true; } }; -#endif diff --git a/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h b/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h index 3574f40e3bb..b9290fa1548 100644 --- a/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h +++ b/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_PROJECTORLENSDISTORTIONOPERATION_H__ -#define __COM_PROJECTORLENSDISTORTIONOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" #include "DNA_node_types.h" @@ -58,4 +58,3 @@ class ProjectorLensDistortionOperation : public NodeOperation { void updateDispersion(); }; -#endif diff --git a/source/blender/compositor/operations/COM_QualityStepHelper.h b/source/blender/compositor/operations/COM_QualityStepHelper.h index 0814f5cdb4c..e437613fb29 100644 --- a/source/blender/compositor/operations/COM_QualityStepHelper.h +++ b/source/blender/compositor/operations/COM_QualityStepHelper.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_QUALITYSTEPHELPER_H__ -#define __COM_QUALITYSTEPHELPER_H__ +#pragma once + #include "COM_defines.h" typedef enum QualityHelper { @@ -54,4 +54,3 @@ class QualityStepHelper { this->m_quality = quality; } }; -#endif diff --git a/source/blender/compositor/operations/COM_ReadBufferOperation.h b/source/blender/compositor/operations/COM_ReadBufferOperation.h index 60d064a5582..e59cb5449d6 100644 --- a/source/blender/compositor/operations/COM_ReadBufferOperation.h +++ b/source/blender/compositor/operations/COM_ReadBufferOperation.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_READBUFFEROPERATION_H__ -#define __COM_READBUFFEROPERATION_H__ +#pragma once #include "COM_MemoryBuffer.h" #include "COM_MemoryProxy.h" @@ -73,5 +72,3 @@ class ReadBufferOperation : public NodeOperation { void readResolutionFromWriteBuffer(); void updateMemoryBuffer(); }; - -#endif diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.h b/source/blender/compositor/operations/COM_RenderLayersProg.h index 6f84eae3252..74664c128c0 100644 --- a/source/blender/compositor/operations/COM_RenderLayersProg.h +++ b/source/blender/compositor/operations/COM_RenderLayersProg.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_RENDERLAYERSPROG_H__ -#define __COM_RENDERLAYERSPROG_H__ +#pragma once #include "BLI_listbase.h" #include "BLI_utildefines.h" @@ -150,5 +149,3 @@ class RenderLayersDepthProg : public RenderLayersProg { } void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); }; - -#endif diff --git a/source/blender/compositor/operations/COM_RotateOperation.h b/source/blender/compositor/operations/COM_RotateOperation.h index 46bdc68161e..0ef4466671a 100644 --- a/source/blender/compositor/operations/COM_RotateOperation.h +++ b/source/blender/compositor/operations/COM_RotateOperation.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_ROTATEOPERATION_H__ -#define __COM_ROTATEOPERATION_H__ +#pragma once #include "COM_NodeOperation.h" @@ -47,5 +46,3 @@ class RotateOperation : public NodeOperation { void ensureDegree(); }; - -#endif diff --git a/source/blender/compositor/operations/COM_ScaleOperation.h b/source/blender/compositor/operations/COM_ScaleOperation.h index 28e32ff8606..f28b8237485 100644 --- a/source/blender/compositor/operations/COM_ScaleOperation.h +++ b/source/blender/compositor/operations/COM_ScaleOperation.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_SCALEOPERATION_H__ -#define __COM_SCALEOPERATION_H__ +#pragma once #include "COM_NodeOperation.h" @@ -129,5 +128,3 @@ class ScaleFixedSizeOperation : public BaseScaleOperation { this->m_offsetY = y; } }; - -#endif diff --git a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h index c9db5bc88b8..f9982d94f60 100644 --- a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h +++ b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_SCREENLENSDISTORTIONOPERATION_H__ -#define __COM_SCREENLENSDISTORTIONOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" #include "DNA_node_types.h" @@ -96,4 +96,3 @@ class ScreenLensDistortionOperation : public NodeOperation { float sum[4], int count[3]) const; }; -#endif diff --git a/source/blender/compositor/operations/COM_SetAlphaOperation.h b/source/blender/compositor/operations/COM_SetAlphaOperation.h index 24f80b71eae..a84fb0f2228 100644 --- a/source/blender/compositor/operations/COM_SetAlphaOperation.h +++ b/source/blender/compositor/operations/COM_SetAlphaOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_SETALPHAOPERATION_H__ -#define __COM_SETALPHAOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" /** @@ -43,4 +43,3 @@ class SetAlphaOperation : public NodeOperation { void initExecution(); void deinitExecution(); }; -#endif diff --git a/source/blender/compositor/operations/COM_SetColorOperation.h b/source/blender/compositor/operations/COM_SetColorOperation.h index d16d3806864..0723ac8a8e4 100644 --- a/source/blender/compositor/operations/COM_SetColorOperation.h +++ b/source/blender/compositor/operations/COM_SetColorOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_SETCOLOROPERATION_H__ -#define __COM_SETCOLOROPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" /** @@ -82,4 +82,3 @@ class SetColorOperation : public NodeOperation { return true; } }; -#endif diff --git a/source/blender/compositor/operations/COM_SetSamplerOperation.h b/source/blender/compositor/operations/COM_SetSamplerOperation.h index 62f01129ff7..c0b5d5a37be 100644 --- a/source/blender/compositor/operations/COM_SetSamplerOperation.h +++ b/source/blender/compositor/operations/COM_SetSamplerOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_SETSAMPLEROPERATION_H__ -#define __COM_SETSAMPLEROPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" /** @@ -47,4 +47,3 @@ class SetSamplerOperation : public NodeOperation { void initExecution(); void deinitExecution(); }; -#endif diff --git a/source/blender/compositor/operations/COM_SetValueOperation.h b/source/blender/compositor/operations/COM_SetValueOperation.h index 6fb2832450d..6645cd558b2 100644 --- a/source/blender/compositor/operations/COM_SetValueOperation.h +++ b/source/blender/compositor/operations/COM_SetValueOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_SETVALUEOPERATION_H__ -#define __COM_SETVALUEOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" /** @@ -54,4 +54,3 @@ class SetValueOperation : public NodeOperation { return true; } }; -#endif diff --git a/source/blender/compositor/operations/COM_SetVectorOperation.h b/source/blender/compositor/operations/COM_SetVectorOperation.h index a2f9aaa6b3b..05c8e6dc56b 100644 --- a/source/blender/compositor/operations/COM_SetVectorOperation.h +++ b/source/blender/compositor/operations/COM_SetVectorOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_SETVECTOROPERATION_H__ -#define __COM_SETVECTOROPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" /** @@ -88,4 +88,3 @@ class SetVectorOperation : public NodeOperation { setZ(vector[2]); } }; -#endif diff --git a/source/blender/compositor/operations/COM_SocketProxyOperation.h b/source/blender/compositor/operations/COM_SocketProxyOperation.h index 3855c26088a..22c144598f6 100644 --- a/source/blender/compositor/operations/COM_SocketProxyOperation.h +++ b/source/blender/compositor/operations/COM_SocketProxyOperation.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_SOCKETPROXYOPERATION_H__ -#define __COM_SOCKETPROXYOPERATION_H__ +#pragma once #include "COM_NodeOperation.h" @@ -46,5 +45,3 @@ class SocketProxyOperation : public NodeOperation { private: bool m_use_conversion; }; - -#endif diff --git a/source/blender/compositor/operations/COM_SplitOperation.h b/source/blender/compositor/operations/COM_SplitOperation.h index ea923123290..62d41a615ff 100644 --- a/source/blender/compositor/operations/COM_SplitOperation.h +++ b/source/blender/compositor/operations/COM_SplitOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_SPLITOPERATION_H__ -#define __COM_SPLITOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" class SplitOperation : public NodeOperation { @@ -43,4 +43,3 @@ class SplitOperation : public NodeOperation { this->m_xSplit = xsplit; } }; -#endif diff --git a/source/blender/compositor/operations/COM_SunBeamsOperation.h b/source/blender/compositor/operations/COM_SunBeamsOperation.h index d8153264d98..09bdb018cc3 100644 --- a/source/blender/compositor/operations/COM_SunBeamsOperation.h +++ b/source/blender/compositor/operations/COM_SunBeamsOperation.h @@ -15,8 +15,7 @@ * Copyright 2014, Blender Foundation. */ -#ifndef __COM_SUNBEAMSOPERATION_H__ -#define __COM_SUNBEAMSOPERATION_H__ +#pragma once #include "COM_NodeOperation.h" @@ -45,5 +44,3 @@ class SunBeamsOperation : public NodeOperation { float m_source_px[2]; float m_ray_length_px; }; - -#endif diff --git a/source/blender/compositor/operations/COM_TextureOperation.h b/source/blender/compositor/operations/COM_TextureOperation.h index ebfdbb6513a..7fa85922b0b 100644 --- a/source/blender/compositor/operations/COM_TextureOperation.h +++ b/source/blender/compositor/operations/COM_TextureOperation.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_TEXTUREOPERATION_H__ -#define __COM_TEXTUREOPERATION_H__ +#pragma once #include "BLI_listbase.h" #include "COM_NodeOperation.h" @@ -81,5 +80,3 @@ class TextureAlphaOperation : public TextureBaseOperation { TextureAlphaOperation(); void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); }; - -#endif diff --git a/source/blender/compositor/operations/COM_TonemapOperation.h b/source/blender/compositor/operations/COM_TonemapOperation.h index 11e82c1fc9c..066332fb7e4 100644 --- a/source/blender/compositor/operations/COM_TonemapOperation.h +++ b/source/blender/compositor/operations/COM_TonemapOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_TONEMAPOPERATION_H__ -#define __COM_TONEMAPOPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" #include "DNA_node_types.h" @@ -98,5 +98,3 @@ class PhotoreceptorTonemapOperation : public TonemapOperation { */ void executePixel(float output[4], int x, int y, void *data); }; - -#endif diff --git a/source/blender/compositor/operations/COM_TrackPositionOperation.h b/source/blender/compositor/operations/COM_TrackPositionOperation.h index 695e85f4fa3..7d831ec5d8d 100644 --- a/source/blender/compositor/operations/COM_TrackPositionOperation.h +++ b/source/blender/compositor/operations/COM_TrackPositionOperation.h @@ -16,8 +16,7 @@ * Copyright 2012, Blender Foundation. */ -#ifndef __COM_TRACKPOSITIONOPERATION_H__ -#define __COM_TRACKPOSITIONOPERATION_H__ +#pragma once #include @@ -97,5 +96,3 @@ class TrackPositionOperation : public NodeOperation { return true; } }; - -#endif diff --git a/source/blender/compositor/operations/COM_TranslateOperation.h b/source/blender/compositor/operations/COM_TranslateOperation.h index 2d13813a86a..99cfb528858 100644 --- a/source/blender/compositor/operations/COM_TranslateOperation.h +++ b/source/blender/compositor/operations/COM_TranslateOperation.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_TRANSLATEOPERATION_H__ -#define __COM_TRANSLATEOPERATION_H__ +#pragma once #include "COM_NodeOperation.h" @@ -65,5 +64,3 @@ class TranslateOperation : public NodeOperation { void setFactorXY(float factorX, float factorY); }; - -#endif diff --git a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h index 930bfd77943..82f41ad68e3 100644 --- a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h +++ b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_VARIABLESIZEBOKEHBLUROPERATION_H__ -#define __COM_VARIABLESIZEBOKEHBLUROPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" #include "COM_QualityStepHelper.h" @@ -123,4 +123,3 @@ class InverseSearchRadiusOperation : public NodeOperation { } }; #endif -#endif diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.h b/source/blender/compositor/operations/COM_VectorBlurOperation.h index 3caf5c5c8e4..846b69310bf 100644 --- a/source/blender/compositor/operations/COM_VectorBlurOperation.h +++ b/source/blender/compositor/operations/COM_VectorBlurOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_VECTORBLUROPERATION_H__ -#define __COM_VECTORBLUROPERATION_H__ +#pragma once + #include "COM_NodeOperation.h" #include "COM_QualityStepHelper.h" #include "DNA_node_types.h" @@ -72,4 +72,3 @@ class VectorBlurOperation : public NodeOperation, public QualityStepHelper { MemoryBuffer *inputSpeed, MemoryBuffer *inputZ); }; -#endif diff --git a/source/blender/compositor/operations/COM_VectorCurveOperation.h b/source/blender/compositor/operations/COM_VectorCurveOperation.h index 65441dbdfb7..9fa5fe78a4b 100644 --- a/source/blender/compositor/operations/COM_VectorCurveOperation.h +++ b/source/blender/compositor/operations/COM_VectorCurveOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_VECTORCURVEOPERATION_H__ -#define __COM_VECTORCURVEOPERATION_H__ +#pragma once + #include "COM_CurveBaseOperation.h" #include "COM_NodeOperation.h" @@ -46,4 +46,3 @@ class VectorCurveOperation : public CurveBaseOperation { */ void deinitExecution(); }; -#endif diff --git a/source/blender/compositor/operations/COM_ViewerOperation.h b/source/blender/compositor/operations/COM_ViewerOperation.h index aae2e912804..680744c70d9 100644 --- a/source/blender/compositor/operations/COM_ViewerOperation.h +++ b/source/blender/compositor/operations/COM_ViewerOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_VIEWEROPERATION_H__ -#define __COM_VIEWEROPERATION_H__ +#pragma once + #include "BKE_global.h" #include "BLI_rect.h" #include "COM_NodeOperation.h" @@ -129,4 +129,3 @@ class ViewerOperation : public NodeOperation { void updateImage(rcti *rect); void initImage(); }; -#endif diff --git a/source/blender/compositor/operations/COM_WrapOperation.h b/source/blender/compositor/operations/COM_WrapOperation.h index 6360fa0c246..d1acfb10f25 100644 --- a/source/blender/compositor/operations/COM_WrapOperation.h +++ b/source/blender/compositor/operations/COM_WrapOperation.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_WRAPOPERATION_H__ -#define __COM_WRAPOPERATION_H__ +#pragma once #include "COM_ReadBufferOperation.h" @@ -38,5 +37,3 @@ class WrapOperation : public ReadBufferOperation { void setFactorXY(float factorX, float factorY); }; - -#endif diff --git a/source/blender/compositor/operations/COM_WriteBufferOperation.h b/source/blender/compositor/operations/COM_WriteBufferOperation.h index be525db4420..a9f90830a92 100644 --- a/source/blender/compositor/operations/COM_WriteBufferOperation.h +++ b/source/blender/compositor/operations/COM_WriteBufferOperation.h @@ -16,8 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_WRITEBUFFEROPERATION_H__ -#define __COM_WRITEBUFFEROPERATION_H__ +#pragma once #include "COM_MemoryProxy.h" #include "COM_NodeOperation.h" @@ -63,4 +62,3 @@ class WriteBufferOperation : public NodeOperation { return m_input; } }; -#endif diff --git a/source/blender/compositor/operations/COM_ZCombineOperation.h b/source/blender/compositor/operations/COM_ZCombineOperation.h index 9a93d080a2f..8c6e73f8c55 100644 --- a/source/blender/compositor/operations/COM_ZCombineOperation.h +++ b/source/blender/compositor/operations/COM_ZCombineOperation.h @@ -16,8 +16,8 @@ * Copyright 2011, Blender Foundation. */ -#ifndef __COM_ZCOMBINEOPERATION_H__ -#define __COM_ZCOMBINEOPERATION_H__ +#pragma once + #include "COM_MixOperation.h" /** @@ -66,5 +66,3 @@ class ZCombineMaskOperation : public NodeOperation { class ZCombineMaskAlphaOperation : public ZCombineMaskOperation { void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); }; - -#endif -- cgit v1.2.3