diff options
Diffstat (limited to 'source/blender/compositor')
122 files changed, 248 insertions, 248 deletions
diff --git a/source/blender/compositor/intern/COM_CompositorContext.h b/source/blender/compositor/intern/COM_CompositorContext.h index b28d5ff0cdf..7e775b7beaf 100644 --- a/source/blender/compositor/intern/COM_CompositorContext.h +++ b/source/blender/compositor/intern/COM_CompositorContext.h @@ -19,13 +19,13 @@ #ifndef __COM_COMPOSITORCONTEXT_H__ #define __COM_COMPOSITORCONTEXT_H__ -#include <vector> -#include <string> -#include "DNA_node_types.h" -#include "DNA_color_types.h" #include "BLI_rect.h" -#include "DNA_scene_types.h" #include "COM_defines.h" +#include "DNA_color_types.h" +#include "DNA_node_types.h" +#include "DNA_scene_types.h" +#include <string> +#include <vector> /** * \brief Overall context of the compositor diff --git a/source/blender/compositor/intern/COM_Converter.cpp b/source/blender/compositor/intern/COM_Converter.cpp index 704833389f8..e8474ba8318 100644 --- a/source/blender/compositor/intern/COM_Converter.cpp +++ b/source/blender/compositor/intern/COM_Converter.cpp @@ -24,8 +24,8 @@ extern "C" { #include "BKE_node.h" } -#include "COM_NodeOperationBuilder.h" #include "COM_NodeOperation.h" +#include "COM_NodeOperationBuilder.h" #include "COM_AlphaOverNode.h" #include "COM_BilateralBlurNode.h" @@ -77,9 +77,9 @@ extern "C" { #include "COM_KeyingScreenNode.h" #include "COM_LensDistortionNode.h" #include "COM_LuminanceMatteNode.h" +#include "COM_MapRangeNode.h" #include "COM_MapUVNode.h" #include "COM_MapValueNode.h" -#include "COM_MapRangeNode.h" #include "COM_MaskNode.h" #include "COM_MathNode.h" #include "COM_MixNode.h" @@ -88,6 +88,8 @@ extern "C" { #include "COM_NormalNode.h" #include "COM_NormalizeNode.h" #include "COM_OutputFileNode.h" +#include "COM_PixelateNode.h" +#include "COM_PlaneTrackDeformNode.h" #include "COM_RenderLayersNode.h" #include "COM_RotateNode.h" #include "COM_ScaleNode.h" @@ -103,18 +105,16 @@ extern "C" { #include "COM_TextureNode.h" #include "COM_TimeNode.h" #include "COM_TonemapNode.h" +#include "COM_TrackPositionNode.h" #include "COM_TransformNode.h" #include "COM_TranslateNode.h" #include "COM_TranslateOperation.h" -#include "COM_TrackPositionNode.h" #include "COM_ValueNode.h" #include "COM_VectorBlurNode.h" #include "COM_VectorCurveNode.h" #include "COM_ViewLevelsNode.h" #include "COM_ViewerNode.h" #include "COM_ZCombineNode.h" -#include "COM_PixelateNode.h" -#include "COM_PlaneTrackDeformNode.h" bool Converter::is_fast_node(bNode *b_node) { diff --git a/source/blender/compositor/intern/COM_Debug.cpp b/source/blender/compositor/intern/COM_Debug.cpp index c2ef7d37a59..b49d575cade 100644 --- a/source/blender/compositor/intern/COM_Debug.cpp +++ b/source/blender/compositor/intern/COM_Debug.cpp @@ -20,24 +20,24 @@ #ifdef COM_DEBUG -# include <typeinfo> # include <map> +# include <typeinfo> # include <vector> extern "C" { -# include "BLI_sys_types.h" # include "BLI_fileops.h" # include "BLI_path_util.h" # include "BLI_string.h" +# include "BLI_sys_types.h" -# include "DNA_node_types.h" # include "BKE_appdir.h" # include "BKE_node.h" +# include "DNA_node_types.h" } -# include "COM_Node.h" -# include "COM_ExecutionSystem.h" # include "COM_ExecutionGroup.h" +# include "COM_ExecutionSystem.h" +# include "COM_Node.h" # include "COM_ReadBufferOperation.h" # include "COM_ViewerOperation.h" diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.cpp b/source/blender/compositor/intern/COM_ExecutionGroup.cpp index deb60836177..e5dfee7d0cd 100644 --- a/source/blender/compositor/intern/COM_ExecutionGroup.cpp +++ b/source/blender/compositor/intern/COM_ExecutionGroup.cpp @@ -23,20 +23,20 @@ #include "atomic_ops.h" +#include "COM_ChunkOrder.h" +#include "COM_Debug.h" #include "COM_ExecutionGroup.h" -#include "COM_defines.h" #include "COM_ExecutionSystem.h" #include "COM_ReadBufferOperation.h" -#include "COM_WriteBufferOperation.h" -#include "COM_WorkScheduler.h" #include "COM_ViewerOperation.h" -#include "COM_ChunkOrder.h" -#include "COM_Debug.h" +#include "COM_WorkScheduler.h" +#include "COM_WriteBufferOperation.h" +#include "COM_defines.h" -#include "MEM_guardedalloc.h" #include "BLI_math.h" #include "BLI_string.h" #include "BLT_translation.h" +#include "MEM_guardedalloc.h" #include "PIL_time.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.h b/source/blender/compositor/intern/COM_ExecutionGroup.h index 89464030cac..1989a6f6205 100644 --- a/source/blender/compositor/intern/COM_ExecutionGroup.h +++ b/source/blender/compositor/intern/COM_ExecutionGroup.h @@ -19,13 +19,13 @@ #ifndef __COM_EXECUTIONGROUP_H__ #define __COM_EXECUTIONGROUP_H__ +#include "BLI_rect.h" +#include "COM_CompositorContext.h" +#include "COM_Device.h" +#include "COM_MemoryProxy.h" #include "COM_Node.h" #include "COM_NodeOperation.h" #include <vector> -#include "BLI_rect.h" -#include "COM_MemoryProxy.h" -#include "COM_Device.h" -#include "COM_CompositorContext.h" using std::vector; diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.cpp b/source/blender/compositor/intern/COM_ExecutionSystem.cpp index d502deb1c93..fa40f150335 100644 --- a/source/blender/compositor/intern/COM_ExecutionSystem.cpp +++ b/source/blender/compositor/intern/COM_ExecutionSystem.cpp @@ -18,8 +18,8 @@ #include "COM_ExecutionSystem.h" -#include "PIL_time.h" #include "BLI_utildefines.h" +#include "PIL_time.h" extern "C" { #include "BKE_node.h" } @@ -27,12 +27,12 @@ extern "C" { #include "BLT_translation.h" #include "COM_Converter.h" -#include "COM_NodeOperationBuilder.h" -#include "COM_NodeOperation.h" +#include "COM_Debug.h" #include "COM_ExecutionGroup.h" -#include "COM_WorkScheduler.h" +#include "COM_NodeOperation.h" +#include "COM_NodeOperationBuilder.h" #include "COM_ReadBufferOperation.h" -#include "COM_Debug.h" +#include "COM_WorkScheduler.h" #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.h b/source/blender/compositor/intern/COM_ExecutionSystem.h index 1977a31b15b..bf65594fc4f 100644 --- a/source/blender/compositor/intern/COM_ExecutionSystem.h +++ b/source/blender/compositor/intern/COM_ExecutionSystem.h @@ -21,12 +21,12 @@ class ExecutionGroup; #ifndef __COM_EXECUTIONSYSTEM_H__ #define __COM_EXECUTIONSYSTEM_H__ -#include "DNA_color_types.h" -#include "DNA_node_types.h" -#include "COM_Node.h" #include "BKE_text.h" #include "COM_ExecutionGroup.h" +#include "COM_Node.h" #include "COM_NodeOperation.h" +#include "DNA_color_types.h" +#include "DNA_node_types.h" /** * \page execution Execution model diff --git a/source/blender/compositor/intern/COM_Node.h b/source/blender/compositor/intern/COM_Node.h index c26f6cdfb8b..a2ab1996a19 100644 --- a/source/blender/compositor/intern/COM_Node.h +++ b/source/blender/compositor/intern/COM_Node.h @@ -20,9 +20,9 @@ #define __COM_NODE_H__ #include "DNA_node_types.h" -#include <vector> -#include <string> #include <algorithm> +#include <string> +#include <vector> /* common node includes * added here so node files don't have to include themselves diff --git a/source/blender/compositor/intern/COM_NodeConverter.cpp b/source/blender/compositor/intern/COM_NodeConverter.cpp index c44721e3939..eff825b075d 100644 --- a/source/blender/compositor/intern/COM_NodeConverter.cpp +++ b/source/blender/compositor/intern/COM_NodeConverter.cpp @@ -22,11 +22,11 @@ extern "C" { #include "COM_Debug.h" -#include "COM_NodeOperationBuilder.h" #include "COM_NodeOperation.h" +#include "COM_NodeOperationBuilder.h" +#include "COM_SetColorOperation.h" #include "COM_SetValueOperation.h" #include "COM_SetVectorOperation.h" -#include "COM_SetColorOperation.h" #include "COM_SocketProxyOperation.h" #include "COM_NodeConverter.h" /* own include */ diff --git a/source/blender/compositor/intern/COM_NodeOperation.cpp b/source/blender/compositor/intern/COM_NodeOperation.cpp index 80243c10760..fa4b5a07c65 100644 --- a/source/blender/compositor/intern/COM_NodeOperation.cpp +++ b/source/blender/compositor/intern/COM_NodeOperation.cpp @@ -16,11 +16,11 @@ * Copyright 2011, Blender Foundation. */ -#include <typeinfo> #include <stdio.h> +#include <typeinfo> -#include "COM_defines.h" #include "COM_ExecutionSystem.h" +#include "COM_defines.h" #include "COM_NodeOperation.h" /* own include */ diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h index 6b073452771..b2c4961ca35 100644 --- a/source/blender/compositor/intern/COM_NodeOperation.h +++ b/source/blender/compositor/intern/COM_NodeOperation.h @@ -20,8 +20,8 @@ #define __COM_NODEOPERATION_H__ #include <list> -#include <string> #include <sstream> +#include <string> extern "C" { #include "BLI_math_color.h" @@ -29,9 +29,9 @@ extern "C" { #include "BLI_threads.h" } -#include "COM_Node.h" #include "COM_MemoryBuffer.h" #include "COM_MemoryProxy.h" +#include "COM_Node.h" #include "COM_SocketReader.h" #include "clew.h" diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp index a00c613d1e2..9f6b91915e0 100644 --- a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp +++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp @@ -20,22 +20,22 @@ extern "C" { #include "BLI_utildefines.h" } -#include "COM_NodeConverter.h" #include "COM_Converter.h" #include "COM_Debug.h" #include "COM_ExecutionSystem.h" #include "COM_Node.h" +#include "COM_NodeConverter.h" #include "COM_SocketProxyNode.h" #include "COM_NodeOperation.h" #include "COM_PreviewOperation.h" +#include "COM_ReadBufferOperation.h" +#include "COM_SetColorOperation.h" #include "COM_SetValueOperation.h" #include "COM_SetVectorOperation.h" -#include "COM_SetColorOperation.h" #include "COM_SocketProxyOperation.h" -#include "COM_ReadBufferOperation.h" -#include "COM_WriteBufferOperation.h" #include "COM_ViewerOperation.h" +#include "COM_WriteBufferOperation.h" #include "COM_NodeOperationBuilder.h" /* own include */ diff --git a/source/blender/compositor/intern/COM_OpenCLDevice.h b/source/blender/compositor/intern/COM_OpenCLDevice.h index 45ce77acac7..3f6e0fb55ef 100644 --- a/source/blender/compositor/intern/COM_OpenCLDevice.h +++ b/source/blender/compositor/intern/COM_OpenCLDevice.h @@ -22,9 +22,9 @@ class OpenCLDevice; #define __COM_OPENCLDEVICE_H__ #include "COM_Device.h" -#include "clew.h" -#include "COM_WorkScheduler.h" #include "COM_ReadBufferOperation.h" +#include "COM_WorkScheduler.h" +#include "clew.h" using std::list; diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cpp b/source/blender/compositor/intern/COM_WorkScheduler.cpp index 5ed2af0c11d..92e64c33d4d 100644 --- a/source/blender/compositor/intern/COM_WorkScheduler.cpp +++ b/source/blender/compositor/intern/COM_WorkScheduler.cpp @@ -19,18 +19,18 @@ #include <list> #include <stdio.h> -#include "COM_compositor.h" -#include "COM_WorkScheduler.h" #include "COM_CPUDevice.h" #include "COM_OpenCLDevice.h" #include "COM_OpenCLKernels.cl.h" -#include "clew.h" +#include "COM_WorkScheduler.h" #include "COM_WriteBufferOperation.h" +#include "COM_compositor.h" +#include "clew.h" #include "MEM_guardedalloc.h" -#include "PIL_time.h" #include "BLI_threads.h" +#include "PIL_time.h" #include "BKE_global.h" diff --git a/source/blender/compositor/intern/COM_WorkScheduler.h b/source/blender/compositor/intern/COM_WorkScheduler.h index 390fde82b61..5e0675f1833 100644 --- a/source/blender/compositor/intern/COM_WorkScheduler.h +++ b/source/blender/compositor/intern/COM_WorkScheduler.h @@ -23,9 +23,9 @@ extern "C" { #include "BLI_threads.h" } +#include "COM_Device.h" #include "COM_WorkPackage.h" #include "COM_defines.h" -#include "COM_Device.h" /** \brief the workscheduler * \ingroup execution diff --git a/source/blender/compositor/intern/COM_compositor.cpp b/source/blender/compositor/intern/COM_compositor.cpp index 50b578a9bc7..1793abae134 100644 --- a/source/blender/compositor/intern/COM_compositor.cpp +++ b/source/blender/compositor/intern/COM_compositor.cpp @@ -25,11 +25,11 @@ extern "C" { #include "BKE_scene.h" -#include "COM_compositor.h" #include "COM_ExecutionSystem.h" +#include "COM_MovieDistortionOperation.h" #include "COM_WorkScheduler.h" +#include "COM_compositor.h" #include "clew.h" -#include "COM_MovieDistortionOperation.h" static ThreadMutex s_compositorMutex; static bool is_compositorMutex_init = false; diff --git a/source/blender/compositor/nodes/COM_AlphaOverNode.cpp b/source/blender/compositor/nodes/COM_AlphaOverNode.cpp index db05043a925..e5764c5bb73 100644 --- a/source/blender/compositor/nodes/COM_AlphaOverNode.cpp +++ b/source/blender/compositor/nodes/COM_AlphaOverNode.cpp @@ -18,10 +18,10 @@ #include "COM_AlphaOverNode.h" -#include "COM_MixOperation.h" #include "COM_AlphaOverKeyOperation.h" #include "COM_AlphaOverMixedOperation.h" #include "COM_AlphaOverPremultiplyOperation.h" +#include "COM_MixOperation.h" #include "COM_SetValueOperation.h" #include "DNA_material_types.h" // the ramp types diff --git a/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp b/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp index 453b1180467..e8037f923f2 100644 --- a/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp +++ b/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp @@ -17,9 +17,9 @@ */ #include "COM_BilateralBlurNode.h" -#include "DNA_node_types.h" -#include "COM_ExecutionSystem.h" #include "COM_BilateralBlurOperation.h" +#include "COM_ExecutionSystem.h" +#include "DNA_node_types.h" BilateralBlurNode::BilateralBlurNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_BlurNode.cpp b/source/blender/compositor/nodes/COM_BlurNode.cpp index a43441a2b13..808c1b22bdb 100644 --- a/source/blender/compositor/nodes/COM_BlurNode.cpp +++ b/source/blender/compositor/nodes/COM_BlurNode.cpp @@ -17,17 +17,17 @@ */ #include "COM_BlurNode.h" -#include "DNA_node_types.h" -#include "COM_GaussianXBlurOperation.h" -#include "COM_GaussianYBlurOperation.h" +#include "COM_ExecutionSystem.h" +#include "COM_FastGaussianBlurOperation.h" +#include "COM_GammaCorrectOperation.h" #include "COM_GaussianAlphaXBlurOperation.h" #include "COM_GaussianAlphaYBlurOperation.h" -#include "COM_ExecutionSystem.h" #include "COM_GaussianBokehBlurOperation.h" -#include "COM_FastGaussianBlurOperation.h" +#include "COM_GaussianXBlurOperation.h" +#include "COM_GaussianYBlurOperation.h" #include "COM_MathBaseOperation.h" #include "COM_SetValueOperation.h" -#include "COM_GammaCorrectOperation.h" +#include "DNA_node_types.h" BlurNode::BlurNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_BokehBlurNode.cpp b/source/blender/compositor/nodes/COM_BokehBlurNode.cpp index 56b5d35cbf5..5096dbef608 100644 --- a/source/blender/compositor/nodes/COM_BokehBlurNode.cpp +++ b/source/blender/compositor/nodes/COM_BokehBlurNode.cpp @@ -17,13 +17,13 @@ */ #include "COM_BokehBlurNode.h" -#include "DNA_camera_types.h" -#include "DNA_object_types.h" -#include "DNA_node_types.h" -#include "COM_ExecutionSystem.h" #include "COM_BokehBlurOperation.h" -#include "COM_VariableSizeBokehBlurOperation.h" #include "COM_ConvertDepthToRadiusOperation.h" +#include "COM_ExecutionSystem.h" +#include "COM_VariableSizeBokehBlurOperation.h" +#include "DNA_camera_types.h" +#include "DNA_node_types.h" +#include "DNA_object_types.h" BokehBlurNode::BokehBlurNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_BoxMaskNode.cpp b/source/blender/compositor/nodes/COM_BoxMaskNode.cpp index 98b4811743f..ef62536595c 100644 --- a/source/blender/compositor/nodes/COM_BoxMaskNode.cpp +++ b/source/blender/compositor/nodes/COM_BoxMaskNode.cpp @@ -20,8 +20,8 @@ #include "COM_BoxMaskOperation.h" #include "COM_ExecutionSystem.h" -#include "COM_SetValueOperation.h" #include "COM_ScaleOperation.h" +#include "COM_SetValueOperation.h" BoxMaskNode::BoxMaskNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp b/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp index 64503ca306b..596d9631297 100644 --- a/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp +++ b/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp @@ -17,10 +17,10 @@ */ #include "COM_ColorBalanceNode.h" -#include "COM_ColorBalanceLGGOperation.h" +#include "BKE_node.h" #include "COM_ColorBalanceASCCDLOperation.h" +#include "COM_ColorBalanceLGGOperation.h" #include "COM_ExecutionSystem.h" -#include "BKE_node.h" #include "COM_MixOperation.h" ColorBalanceNode::ColorBalanceNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_ColorNode.cpp b/source/blender/compositor/nodes/COM_ColorNode.cpp index 6bc700e3aa1..e6f8bfa01fe 100644 --- a/source/blender/compositor/nodes/COM_ColorNode.cpp +++ b/source/blender/compositor/nodes/COM_ColorNode.cpp @@ -17,8 +17,8 @@ */ #include "COM_ColorNode.h" -#include "COM_SetColorOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_SetColorOperation.h" ColorNode::ColorNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_ColorRampNode.cpp b/source/blender/compositor/nodes/COM_ColorRampNode.cpp index 0745f32218d..1504a76cee7 100644 --- a/source/blender/compositor/nodes/COM_ColorRampNode.cpp +++ b/source/blender/compositor/nodes/COM_ColorRampNode.cpp @@ -17,10 +17,10 @@ */ #include "COM_ColorRampNode.h" -#include "COM_ExecutionSystem.h" #include "BKE_node.h" #include "COM_ColorRampOperation.h" #include "COM_ConvertOperation.h" +#include "COM_ExecutionSystem.h" #include "DNA_texture_types.h" ColorRampNode::ColorRampNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_CryptomatteNode.cpp b/source/blender/compositor/nodes/COM_CryptomatteNode.cpp index da80ef697c1..8cc6b933759 100644 --- a/source/blender/compositor/nodes/COM_CryptomatteNode.cpp +++ b/source/blender/compositor/nodes/COM_CryptomatteNode.cpp @@ -17,12 +17,12 @@ */ #include "COM_CryptomatteNode.h" +#include "BLI_assert.h" +#include "BLI_hash_mm3.h" +#include "BLI_string.h" +#include "COM_ConvertOperation.h" #include "COM_CryptomatteOperation.h" #include "COM_SetAlphaOperation.h" -#include "COM_ConvertOperation.h" -#include "BLI_string.h" -#include "BLI_hash_mm3.h" -#include "BLI_assert.h" #include <iterator> CryptomatteNode::CryptomatteNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_DefocusNode.cpp b/source/blender/compositor/nodes/COM_DefocusNode.cpp index 8d64b629e40..0f09e5bfc91 100644 --- a/source/blender/compositor/nodes/COM_DefocusNode.cpp +++ b/source/blender/compositor/nodes/COM_DefocusNode.cpp @@ -17,18 +17,18 @@ */ #include "COM_DefocusNode.h" -#include "DNA_scene_types.h" -#include "DNA_camera_types.h" -#include "DNA_object_types.h" -#include "DNA_node_types.h" -#include "COM_ExecutionSystem.h" -#include "COM_ConvertDepthToRadiusOperation.h" -#include "COM_VariableSizeBokehBlurOperation.h" #include "COM_BokehImageOperation.h" +#include "COM_ConvertDepthToRadiusOperation.h" +#include "COM_ExecutionSystem.h" +#include "COM_FastGaussianBlurOperation.h" +#include "COM_GammaCorrectOperation.h" #include "COM_MathBaseOperation.h" #include "COM_SetValueOperation.h" -#include "COM_GammaCorrectOperation.h" -#include "COM_FastGaussianBlurOperation.h" +#include "COM_VariableSizeBokehBlurOperation.h" +#include "DNA_camera_types.h" +#include "DNA_node_types.h" +#include "DNA_object_types.h" +#include "DNA_scene_types.h" DefocusNode::DefocusNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_DenoiseNode.cpp b/source/blender/compositor/nodes/COM_DenoiseNode.cpp index a18fc82908a..1aae81e1e7b 100644 --- a/source/blender/compositor/nodes/COM_DenoiseNode.cpp +++ b/source/blender/compositor/nodes/COM_DenoiseNode.cpp @@ -16,10 +16,10 @@ * Copyright 2019, Blender Foundation. */ #include "COM_DenoiseNode.h" -#include "DNA_node_types.h" -#include "COM_SetValueOperation.h" -#include "COM_MixOperation.h" #include "COM_DenoiseOperation.h" +#include "COM_MixOperation.h" +#include "COM_SetValueOperation.h" +#include "DNA_node_types.h" DenoiseNode::DenoiseNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_DespeckleNode.cpp b/source/blender/compositor/nodes/COM_DespeckleNode.cpp index 16de1bd29d7..58734917831 100644 --- a/source/blender/compositor/nodes/COM_DespeckleNode.cpp +++ b/source/blender/compositor/nodes/COM_DespeckleNode.cpp @@ -17,10 +17,10 @@ */ #include "COM_DespeckleNode.h" -#include "DNA_scene_types.h" -#include "COM_ExecutionSystem.h" -#include "COM_DespeckleOperation.h" #include "BLI_math.h" +#include "COM_DespeckleOperation.h" +#include "COM_ExecutionSystem.h" +#include "DNA_scene_types.h" DespeckleNode::DespeckleNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_DilateErodeNode.cpp b/source/blender/compositor/nodes/COM_DilateErodeNode.cpp index 50fbe983c91..e90707618e5 100644 --- a/source/blender/compositor/nodes/COM_DilateErodeNode.cpp +++ b/source/blender/compositor/nodes/COM_DilateErodeNode.cpp @@ -17,12 +17,12 @@ */ #include "COM_DilateErodeNode.h" -#include "COM_ExecutionSystem.h" -#include "COM_DilateErodeOperation.h" +#include "BLI_math.h" #include "COM_AntiAliasOperation.h" +#include "COM_DilateErodeOperation.h" +#include "COM_ExecutionSystem.h" #include "COM_GaussianAlphaXBlurOperation.h" #include "COM_GaussianAlphaYBlurOperation.h" -#include "BLI_math.h" DilateErodeNode::DilateErodeNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp b/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp index faae759ba0c..f8d0eaf4675 100644 --- a/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp +++ b/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp @@ -17,9 +17,9 @@ */ #include "COM_DirectionalBlurNode.h" -#include "DNA_node_types.h" -#include "COM_ExecutionSystem.h" #include "COM_DirectionalBlurOperation.h" +#include "COM_ExecutionSystem.h" +#include "DNA_node_types.h" DirectionalBlurNode::DirectionalBlurNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp b/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp index 5f001f723e8..946d55d33fc 100644 --- a/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp +++ b/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp @@ -18,10 +18,10 @@ #include "COM_DistanceMatteNode.h" #include "BKE_node.h" +#include "COM_ConvertOperation.h" #include "COM_DistanceRGBMatteOperation.h" #include "COM_DistanceYCCMatteOperation.h" #include "COM_SetAlphaOperation.h" -#include "COM_ConvertOperation.h" DistanceMatteNode::DistanceMatteNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp b/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp index 349d0908a98..30d00252b76 100644 --- a/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp +++ b/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp @@ -20,8 +20,8 @@ #include "COM_EllipseMaskOperation.h" #include "COM_ExecutionSystem.h" -#include "COM_SetValueOperation.h" #include "COM_ScaleOperation.h" +#include "COM_SetValueOperation.h" EllipseMaskNode::EllipseMaskNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_FilterNode.cpp b/source/blender/compositor/nodes/COM_FilterNode.cpp index 1972cabc7c4..8b8ff55d544 100644 --- a/source/blender/compositor/nodes/COM_FilterNode.cpp +++ b/source/blender/compositor/nodes/COM_FilterNode.cpp @@ -17,10 +17,10 @@ */ #include "COM_FilterNode.h" -#include "COM_ConvolutionFilterOperation.h" +#include "BKE_node.h" #include "COM_ConvolutionEdgeFilterOperation.h" +#include "COM_ConvolutionFilterOperation.h" #include "COM_ExecutionSystem.h" -#include "BKE_node.h" #include "COM_MixOperation.h" FilterNode::FilterNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_FlipNode.cpp b/source/blender/compositor/nodes/COM_FlipNode.cpp index 4dfff9c8e49..47148ceb1a9 100644 --- a/source/blender/compositor/nodes/COM_FlipNode.cpp +++ b/source/blender/compositor/nodes/COM_FlipNode.cpp @@ -18,8 +18,8 @@ #include "COM_FlipNode.h" -#include "COM_FlipOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_FlipOperation.h" FlipNode::FlipNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_GammaNode.cpp b/source/blender/compositor/nodes/COM_GammaNode.cpp index 0c60c871864..1ce17faa0dc 100644 --- a/source/blender/compositor/nodes/COM_GammaNode.cpp +++ b/source/blender/compositor/nodes/COM_GammaNode.cpp @@ -17,8 +17,8 @@ */ #include "COM_GammaNode.h" -#include "COM_GammaOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_GammaOperation.h" GammaNode::GammaNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_GlareNode.cpp b/source/blender/compositor/nodes/COM_GlareNode.cpp index 6a65486a97f..1ff058ce7d4 100644 --- a/source/blender/compositor/nodes/COM_GlareNode.cpp +++ b/source/blender/compositor/nodes/COM_GlareNode.cpp @@ -17,15 +17,15 @@ */ #include "COM_GlareNode.h" -#include "DNA_node_types.h" -#include "COM_GlareThresholdOperation.h" +#include "COM_FastGaussianBlurOperation.h" +#include "COM_GlareFogGlowOperation.h" +#include "COM_GlareGhostOperation.h" #include "COM_GlareSimpleStarOperation.h" #include "COM_GlareStreaksOperation.h" -#include "COM_SetValueOperation.h" +#include "COM_GlareThresholdOperation.h" #include "COM_MixOperation.h" -#include "COM_FastGaussianBlurOperation.h" -#include "COM_GlareGhostOperation.h" -#include "COM_GlareFogGlowOperation.h" +#include "COM_SetValueOperation.h" +#include "DNA_node_types.h" GlareNode::GlareNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp b/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp index b1157242e10..00125ba2ea5 100644 --- a/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp +++ b/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp @@ -20,11 +20,11 @@ #include "COM_ConvertOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_HueSaturationValueCorrectOperation.h" #include "COM_MixOperation.h" #include "COM_SetColorOperation.h" #include "COM_SetValueOperation.h" #include "DNA_node_types.h" -#include "COM_HueSaturationValueCorrectOperation.h" HueSaturationValueCorrectNode::HueSaturationValueCorrectNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp b/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp index 8aae5f0409c..dc2e5187e8f 100644 --- a/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp +++ b/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp @@ -18,12 +18,12 @@ #include "COM_HueSaturationValueNode.h" +#include "COM_ChangeHSVOperation.h" #include "COM_ConvertOperation.h" #include "COM_ExecutionSystem.h" #include "COM_MixOperation.h" #include "COM_SetColorOperation.h" #include "COM_SetValueOperation.h" -#include "COM_ChangeHSVOperation.h" #include "DNA_node_types.h" HueSaturationValueNode::HueSaturationValueNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_IDMaskNode.cpp b/source/blender/compositor/nodes/COM_IDMaskNode.cpp index 50dd2ed93e9..5ba54d75bcd 100644 --- a/source/blender/compositor/nodes/COM_IDMaskNode.cpp +++ b/source/blender/compositor/nodes/COM_IDMaskNode.cpp @@ -17,9 +17,9 @@ */ #include "COM_IDMaskNode.h" -#include "COM_IDMaskOperation.h" -#include "COM_ExecutionSystem.h" #include "COM_AntiAliasOperation.h" +#include "COM_ExecutionSystem.h" +#include "COM_IDMaskOperation.h" IDMaskNode::IDMaskNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_ImageNode.cpp b/source/blender/compositor/nodes/COM_ImageNode.cpp index 8e2590a9d92..3dbd3773247 100644 --- a/source/blender/compositor/nodes/COM_ImageNode.cpp +++ b/source/blender/compositor/nodes/COM_ImageNode.cpp @@ -17,17 +17,17 @@ */ #include "COM_ImageNode.h" +#include "BKE_node.h" +#include "BLI_utildefines.h" +#include "COM_ConvertOperation.h" #include "COM_ExecutionSystem.h" #include "COM_ImageOperation.h" #include "COM_MultilayerImageOperation.h" -#include "COM_ConvertOperation.h" -#include "BKE_node.h" -#include "BLI_utildefines.h" +#include "COM_SeparateColorNode.h" +#include "COM_SetColorOperation.h" #include "COM_SetValueOperation.h" #include "COM_SetVectorOperation.h" -#include "COM_SetColorOperation.h" -#include "COM_SeparateColorNode.h" ImageNode::ImageNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_ImageNode.h b/source/blender/compositor/nodes/COM_ImageNode.h index cde9f997f85..6ed9acd58b8 100644 --- a/source/blender/compositor/nodes/COM_ImageNode.h +++ b/source/blender/compositor/nodes/COM_ImageNode.h @@ -19,10 +19,10 @@ #ifndef __COM_IMAGENODE_H__ #define __COM_IMAGENODE_H__ -#include "COM_defines.h" #include "COM_Node.h" -#include "DNA_node_types.h" +#include "COM_defines.h" #include "DNA_image_types.h" +#include "DNA_node_types.h" extern "C" { #include "RE_engine.h" } diff --git a/source/blender/compositor/nodes/COM_InpaintNode.cpp b/source/blender/compositor/nodes/COM_InpaintNode.cpp index 454aa3e147b..40fe63ec9f3 100644 --- a/source/blender/compositor/nodes/COM_InpaintNode.cpp +++ b/source/blender/compositor/nodes/COM_InpaintNode.cpp @@ -17,10 +17,10 @@ */ #include "COM_InpaintNode.h" -#include "DNA_scene_types.h" +#include "BLI_math.h" #include "COM_ExecutionSystem.h" #include "COM_InpaintOperation.h" -#include "BLI_math.h" +#include "DNA_scene_types.h" InpaintNode::InpaintNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_InvertNode.cpp b/source/blender/compositor/nodes/COM_InvertNode.cpp index 82dd707a817..913452c42c8 100644 --- a/source/blender/compositor/nodes/COM_InvertNode.cpp +++ b/source/blender/compositor/nodes/COM_InvertNode.cpp @@ -17,9 +17,9 @@ */ #include "COM_InvertNode.h" -#include "COM_InvertOperation.h" -#include "COM_ExecutionSystem.h" #include "BKE_node.h" +#include "COM_ExecutionSystem.h" +#include "COM_InvertOperation.h" InvertNode::InvertNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_KeyingNode.cpp b/source/blender/compositor/nodes/COM_KeyingNode.cpp index b2ce7e1988c..b75d06763b7 100644 --- a/source/blender/compositor/nodes/COM_KeyingNode.cpp +++ b/source/blender/compositor/nodes/COM_KeyingNode.cpp @@ -20,10 +20,10 @@ #include "COM_ExecutionSystem.h" -#include "COM_KeyingOperation.h" #include "COM_KeyingBlurOperation.h" -#include "COM_KeyingDespillOperation.h" #include "COM_KeyingClipOperation.h" +#include "COM_KeyingDespillOperation.h" +#include "COM_KeyingOperation.h" #include "COM_MathBaseOperation.h" diff --git a/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp b/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp index 3599372f189..e435cefeefe 100644 --- a/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp +++ b/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp @@ -18,8 +18,8 @@ #include "COM_LuminanceMatteNode.h" #include "BKE_node.h" -#include "COM_LuminanceMatteOperation.h" #include "COM_ConvertOperation.h" +#include "COM_LuminanceMatteOperation.h" #include "COM_SetAlphaOperation.h" LuminanceMatteNode::LuminanceMatteNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_MapRangeNode.cpp b/source/blender/compositor/nodes/COM_MapRangeNode.cpp index 3b6d2fe0dcb..352bc0dd48d 100644 --- a/source/blender/compositor/nodes/COM_MapRangeNode.cpp +++ b/source/blender/compositor/nodes/COM_MapRangeNode.cpp @@ -18,8 +18,8 @@ #include "COM_MapRangeNode.h" -#include "COM_MapRangeOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_MapRangeOperation.h" MapRangeNode::MapRangeNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_MapUVNode.cpp b/source/blender/compositor/nodes/COM_MapUVNode.cpp index fe4895833cf..feb9c75ec56 100644 --- a/source/blender/compositor/nodes/COM_MapUVNode.cpp +++ b/source/blender/compositor/nodes/COM_MapUVNode.cpp @@ -17,8 +17,8 @@ */ #include "COM_MapUVNode.h" -#include "COM_MapUVOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_MapUVOperation.h" MapUVNode::MapUVNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_MapValueNode.cpp b/source/blender/compositor/nodes/COM_MapValueNode.cpp index 4ed971a2fcc..e07df8ad367 100644 --- a/source/blender/compositor/nodes/COM_MapValueNode.cpp +++ b/source/blender/compositor/nodes/COM_MapValueNode.cpp @@ -18,8 +18,8 @@ #include "COM_MapValueNode.h" -#include "COM_MapValueOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_MapValueOperation.h" MapValueNode::MapValueNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_MathNode.cpp b/source/blender/compositor/nodes/COM_MathNode.cpp index 5497d4a4755..227e26af2b2 100644 --- a/source/blender/compositor/nodes/COM_MathNode.cpp +++ b/source/blender/compositor/nodes/COM_MathNode.cpp @@ -17,8 +17,8 @@ */ #include "COM_MathNode.h" -#include "COM_MathBaseOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_MathBaseOperation.h" void MathNode::convertToOperations(NodeConverter &converter, const CompositorContext & /*context*/) const diff --git a/source/blender/compositor/nodes/COM_MovieClipNode.cpp b/source/blender/compositor/nodes/COM_MovieClipNode.cpp index f5ea6b2653a..29fd47f33b3 100644 --- a/source/blender/compositor/nodes/COM_MovieClipNode.cpp +++ b/source/blender/compositor/nodes/COM_MovieClipNode.cpp @@ -17,15 +17,15 @@ */ #include "COM_MovieClipNode.h" +#include "COM_ConvertColorProfileOperation.h" #include "COM_ExecutionSystem.h" #include "COM_MovieClipOperation.h" #include "COM_SetValueOperation.h" -#include "COM_ConvertColorProfileOperation.h" extern "C" { -#include "DNA_movieclip_types.h" #include "BKE_movieclip.h" #include "BKE_tracking.h" +#include "DNA_movieclip_types.h" #include "IMB_imbuf.h" } diff --git a/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp b/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp index d0ec152fca4..ebace6d5fff 100644 --- a/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp +++ b/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp @@ -18,8 +18,8 @@ #include "COM_MovieDistortionNode.h" -#include "COM_MovieDistortionOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_MovieDistortionOperation.h" #include "DNA_movieclip_types.h" MovieDistortionNode::MovieDistortionNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_NormalNode.cpp b/source/blender/compositor/nodes/COM_NormalNode.cpp index a6f39312601..1f48a26fd75 100644 --- a/source/blender/compositor/nodes/COM_NormalNode.cpp +++ b/source/blender/compositor/nodes/COM_NormalNode.cpp @@ -17,9 +17,9 @@ */ #include "COM_NormalNode.h" -#include "COM_ExecutionSystem.h" #include "BKE_node.h" #include "COM_DotproductOperation.h" +#include "COM_ExecutionSystem.h" #include "COM_SetVectorOperation.h" NormalNode::NormalNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_NormalizeNode.cpp b/source/blender/compositor/nodes/COM_NormalizeNode.cpp index dc061279664..72459fd477c 100644 --- a/source/blender/compositor/nodes/COM_NormalizeNode.cpp +++ b/source/blender/compositor/nodes/COM_NormalizeNode.cpp @@ -17,8 +17,8 @@ */ #include "COM_NormalizeNode.h" -#include "COM_NormalizeOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_NormalizeOperation.h" NormalizeNode::NormalizeNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_OutputFileNode.cpp b/source/blender/compositor/nodes/COM_OutputFileNode.cpp index d40f822eb55..1269e0b7f77 100644 --- a/source/blender/compositor/nodes/COM_OutputFileNode.cpp +++ b/source/blender/compositor/nodes/COM_OutputFileNode.cpp @@ -17,9 +17,9 @@ */ #include "COM_OutputFileNode.h" -#include "COM_OutputFileOperation.h" -#include "COM_OutputFileMultiViewOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_OutputFileMultiViewOperation.h" +#include "COM_OutputFileOperation.h" #include "BKE_scene.h" diff --git a/source/blender/compositor/nodes/COM_PixelateNode.cpp b/source/blender/compositor/nodes/COM_PixelateNode.cpp index be7747f3f14..f238f68727e 100644 --- a/source/blender/compositor/nodes/COM_PixelateNode.cpp +++ b/source/blender/compositor/nodes/COM_PixelateNode.cpp @@ -18,8 +18,8 @@ #include "COM_PixelateNode.h" -#include "COM_PixelateOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_PixelateOperation.h" PixelateNode::PixelateNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp b/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp index 2285af01154..39616bba4f9 100644 --- a/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp +++ b/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp @@ -22,8 +22,8 @@ #include "COM_PlaneTrackOperation.h" extern "C" { -#include "BKE_node.h" #include "BKE_movieclip.h" +#include "BKE_node.h" #include "BKE_tracking.h" } diff --git a/source/blender/compositor/nodes/COM_RenderLayersNode.cpp b/source/blender/compositor/nodes/COM_RenderLayersNode.cpp index a361c57a2c2..d66dd3fd434 100644 --- a/source/blender/compositor/nodes/COM_RenderLayersNode.cpp +++ b/source/blender/compositor/nodes/COM_RenderLayersNode.cpp @@ -18,12 +18,12 @@ #include "COM_RenderLayersNode.h" #include "COM_RenderLayersProg.h" -#include "COM_TranslateOperation.h" #include "COM_RotateOperation.h" #include "COM_ScaleOperation.h" #include "COM_SetColorOperation.h" #include "COM_SetValueOperation.h" #include "COM_SetVectorOperation.h" +#include "COM_TranslateOperation.h" RenderLayersNode::RenderLayersNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_RenderLayersNode.h b/source/blender/compositor/nodes/COM_RenderLayersNode.h index f6822f98fd9..c992f60581f 100644 --- a/source/blender/compositor/nodes/COM_RenderLayersNode.h +++ b/source/blender/compositor/nodes/COM_RenderLayersNode.h @@ -20,8 +20,8 @@ #define __COM_RENDERLAYERSNODE_H__ #include "COM_Node.h" -#include "DNA_node_types.h" #include "COM_RenderLayersProg.h" +#include "DNA_node_types.h" struct Render; diff --git a/source/blender/compositor/nodes/COM_RotateNode.cpp b/source/blender/compositor/nodes/COM_RotateNode.cpp index e1c84ce3584..cbade778bcb 100644 --- a/source/blender/compositor/nodes/COM_RotateNode.cpp +++ b/source/blender/compositor/nodes/COM_RotateNode.cpp @@ -18,8 +18,8 @@ #include "COM_RotateNode.h" -#include "COM_RotateOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_RotateOperation.h" #include "COM_SetSamplerOperation.h" RotateNode::RotateNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_ScaleNode.cpp b/source/blender/compositor/nodes/COM_ScaleNode.cpp index e47f673a8be..e57c30cff29 100644 --- a/source/blender/compositor/nodes/COM_ScaleNode.cpp +++ b/source/blender/compositor/nodes/COM_ScaleNode.cpp @@ -18,11 +18,11 @@ #include "COM_ScaleNode.h" -#include "COM_ScaleOperation.h" -#include "COM_ExecutionSystem.h" #include "BKE_node.h" -#include "COM_SetValueOperation.h" +#include "COM_ExecutionSystem.h" +#include "COM_ScaleOperation.h" #include "COM_SetSamplerOperation.h" +#include "COM_SetValueOperation.h" ScaleNode::ScaleNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_SetAlphaNode.cpp b/source/blender/compositor/nodes/COM_SetAlphaNode.cpp index 53454fedfe4..7b722fe4440 100644 --- a/source/blender/compositor/nodes/COM_SetAlphaNode.cpp +++ b/source/blender/compositor/nodes/COM_SetAlphaNode.cpp @@ -17,8 +17,8 @@ */ #include "COM_SetAlphaNode.h" -#include "COM_SetAlphaOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_SetAlphaOperation.h" void SetAlphaNode::convertToOperations(NodeConverter &converter, const CompositorContext & /*context*/) const diff --git a/source/blender/compositor/nodes/COM_SocketProxyNode.cpp b/source/blender/compositor/nodes/COM_SocketProxyNode.cpp index 5476a21d2a5..a84dbf680fe 100644 --- a/source/blender/compositor/nodes/COM_SocketProxyNode.cpp +++ b/source/blender/compositor/nodes/COM_SocketProxyNode.cpp @@ -17,13 +17,13 @@ */ #include "COM_SocketProxyNode.h" -#include "COM_SocketProxyOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_ReadBufferOperation.h" +#include "COM_SetColorOperation.h" #include "COM_SetValueOperation.h" #include "COM_SetVectorOperation.h" -#include "COM_SetColorOperation.h" +#include "COM_SocketProxyOperation.h" #include "COM_WriteBufferOperation.h" -#include "COM_ReadBufferOperation.h" SocketProxyNode::SocketProxyNode(bNode *editorNode, bNodeSocket *editorInput, diff --git a/source/blender/compositor/nodes/COM_SplitViewerNode.cpp b/source/blender/compositor/nodes/COM_SplitViewerNode.cpp index f73e3d08a74..75703876d9e 100644 --- a/source/blender/compositor/nodes/COM_SplitViewerNode.cpp +++ b/source/blender/compositor/nodes/COM_SplitViewerNode.cpp @@ -21,9 +21,9 @@ #include "BKE_image.h" #include "BKE_scene.h" +#include "COM_ExecutionSystem.h" #include "COM_SplitOperation.h" #include "COM_ViewerOperation.h" -#include "COM_ExecutionSystem.h" SplitViewerNode::SplitViewerNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp b/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp index cc14d8d952f..0b6cb97b049 100644 --- a/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp +++ b/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp @@ -18,15 +18,15 @@ #include "COM_Stabilize2dNode.h" #include "COM_ExecutionSystem.h" -#include "COM_TranslateOperation.h" +#include "COM_MovieClipAttributeOperation.h" #include "COM_RotateOperation.h" #include "COM_ScaleOperation.h" -#include "COM_MovieClipAttributeOperation.h" #include "COM_SetSamplerOperation.h" +#include "COM_TranslateOperation.h" extern "C" { -#include "DNA_movieclip_types.h" #include "BKE_tracking.h" +#include "DNA_movieclip_types.h" } Stabilize2dNode::Stabilize2dNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_TimeNode.cpp b/source/blender/compositor/nodes/COM_TimeNode.cpp index 2a30ee9c574..b6927fb8373 100644 --- a/source/blender/compositor/nodes/COM_TimeNode.cpp +++ b/source/blender/compositor/nodes/COM_TimeNode.cpp @@ -17,8 +17,8 @@ */ #include "COM_TimeNode.h" -#include "COM_SetValueOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_SetValueOperation.h" extern "C" { #include "BKE_colortools.h" } diff --git a/source/blender/compositor/nodes/COM_TonemapNode.cpp b/source/blender/compositor/nodes/COM_TonemapNode.cpp index 2b13a6519e3..db329e56f9b 100644 --- a/source/blender/compositor/nodes/COM_TonemapNode.cpp +++ b/source/blender/compositor/nodes/COM_TonemapNode.cpp @@ -17,8 +17,8 @@ */ #include "COM_TonemapNode.h" -#include "COM_TonemapOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_TonemapOperation.h" TonemapNode::TonemapNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_TransformNode.cpp b/source/blender/compositor/nodes/COM_TransformNode.cpp index 738039fc255..cd5ba8ba201 100644 --- a/source/blender/compositor/nodes/COM_TransformNode.cpp +++ b/source/blender/compositor/nodes/COM_TransformNode.cpp @@ -18,11 +18,11 @@ #include "COM_TransformNode.h" #include "COM_ExecutionSystem.h" -#include "COM_TranslateOperation.h" #include "COM_RotateOperation.h" #include "COM_ScaleOperation.h" -#include "COM_SetValueOperation.h" #include "COM_SetSamplerOperation.h" +#include "COM_SetValueOperation.h" +#include "COM_TranslateOperation.h" TransformNode::TransformNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_TranslateNode.cpp b/source/blender/compositor/nodes/COM_TranslateNode.cpp index 8fed5c9b003..33f48747853 100644 --- a/source/blender/compositor/nodes/COM_TranslateNode.cpp +++ b/source/blender/compositor/nodes/COM_TranslateNode.cpp @@ -18,10 +18,10 @@ #include "COM_TranslateNode.h" +#include "COM_ExecutionSystem.h" #include "COM_TranslateOperation.h" #include "COM_WrapOperation.h" #include "COM_WriteBufferOperation.h" -#include "COM_ExecutionSystem.h" TranslateNode::TranslateNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_ValueNode.cpp b/source/blender/compositor/nodes/COM_ValueNode.cpp index f9769c3709a..4227db0d10e 100644 --- a/source/blender/compositor/nodes/COM_ValueNode.cpp +++ b/source/blender/compositor/nodes/COM_ValueNode.cpp @@ -17,8 +17,8 @@ */ #include "COM_ValueNode.h" -#include "COM_SetValueOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_SetValueOperation.h" ValueNode::ValueNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_VectorBlurNode.cpp b/source/blender/compositor/nodes/COM_VectorBlurNode.cpp index 4ff2f3ddfb1..a92991c8b49 100644 --- a/source/blender/compositor/nodes/COM_VectorBlurNode.cpp +++ b/source/blender/compositor/nodes/COM_VectorBlurNode.cpp @@ -17,8 +17,8 @@ */ #include "COM_VectorBlurNode.h" -#include "DNA_node_types.h" #include "COM_VectorBlurOperation.h" +#include "DNA_node_types.h" VectorBlurNode::VectorBlurNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_VectorCurveNode.cpp b/source/blender/compositor/nodes/COM_VectorCurveNode.cpp index 4f8485a430b..1201a9f9613 100644 --- a/source/blender/compositor/nodes/COM_VectorCurveNode.cpp +++ b/source/blender/compositor/nodes/COM_VectorCurveNode.cpp @@ -17,8 +17,8 @@ */ #include "COM_VectorCurveNode.h" -#include "COM_VectorCurveOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_VectorCurveOperation.h" VectorCurveNode::VectorCurveNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp b/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp index b6c12365ce0..7b86fb1d64d 100644 --- a/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp +++ b/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp @@ -17,9 +17,9 @@ */ #include "COM_ViewLevelsNode.h" -#include "COM_ExecutionSystem.h" #include "COM_CalculateMeanOperation.h" #include "COM_CalculateStandardDeviationOperation.h" +#include "COM_ExecutionSystem.h" #include "COM_SetValueOperation.h" ViewLevelsNode::ViewLevelsNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_ViewerNode.cpp b/source/blender/compositor/nodes/COM_ViewerNode.cpp index 6170fafcb2c..fa6c1bc3c28 100644 --- a/source/blender/compositor/nodes/COM_ViewerNode.cpp +++ b/source/blender/compositor/nodes/COM_ViewerNode.cpp @@ -19,11 +19,11 @@ #include "COM_ViewerNode.h" #include "BKE_global.h" #include "BKE_image.h" -#include "BLI_listbase.h" #include "BKE_scene.h" +#include "BLI_listbase.h" -#include "COM_ViewerOperation.h" #include "COM_ExecutionSystem.h" +#include "COM_ViewerOperation.h" ViewerNode::ViewerNode(bNode *editorNode) : Node(editorNode) { diff --git a/source/blender/compositor/nodes/COM_ZCombineNode.cpp b/source/blender/compositor/nodes/COM_ZCombineNode.cpp index 4faf828d6df..b30a603bcee 100644 --- a/source/blender/compositor/nodes/COM_ZCombineNode.cpp +++ b/source/blender/compositor/nodes/COM_ZCombineNode.cpp @@ -20,11 +20,11 @@ #include "COM_ZCombineOperation.h" +#include "COM_AntiAliasOperation.h" #include "COM_ExecutionSystem.h" -#include "COM_SetValueOperation.h" #include "COM_MathBaseOperation.h" -#include "COM_AntiAliasOperation.h" #include "COM_MixOperation.h" +#include "COM_SetValueOperation.h" #include "DNA_material_types.h" // the ramp types diff --git a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h index 7fb9d839d2d..377276777f0 100644 --- a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h +++ b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h @@ -18,9 +18,9 @@ #ifndef __COM_CALCULATESTANDARDDEVIATIONOPERATION_H__ #define __COM_CALCULATESTANDARDDEVIATIONOPERATION_H__ +#include "COM_CalculateMeanOperation.h" #include "COM_NodeOperation.h" #include "DNA_node_types.h" -#include "COM_CalculateMeanOperation.h" /** * \brief base class of CalculateStandardDeviation, * implementing the simple CalculateStandardDeviation. diff --git a/source/blender/compositor/operations/COM_ColorCurveOperation.h b/source/blender/compositor/operations/COM_ColorCurveOperation.h index 1d6a9185732..7869d1c4a56 100644 --- a/source/blender/compositor/operations/COM_ColorCurveOperation.h +++ b/source/blender/compositor/operations/COM_ColorCurveOperation.h @@ -18,9 +18,9 @@ #ifndef __COM_COLORCURVEOPERATION_H__ #define __COM_COLORCURVEOPERATION_H__ +#include "COM_CurveBaseOperation.h" #include "COM_NodeOperation.h" #include "DNA_color_types.h" -#include "COM_CurveBaseOperation.h" class ColorCurveOperation : public CurveBaseOperation { private: diff --git a/source/blender/compositor/operations/COM_CompositorOperation.cpp b/source/blender/compositor/operations/COM_CompositorOperation.cpp index 20ea7009105..cb41071e6f0 100644 --- a/source/blender/compositor/operations/COM_CompositorOperation.cpp +++ b/source/blender/compositor/operations/COM_CompositorOperation.cpp @@ -17,16 +17,16 @@ */ #include "COM_CompositorOperation.h" -#include "MEM_guardedalloc.h" -#include "BLI_listbase.h" #include "BKE_global.h" #include "BKE_image.h" +#include "BLI_listbase.h" +#include "MEM_guardedalloc.h" extern "C" { #include "BLI_threads.h" #include "RE_pipeline.h" -#include "RE_shader_ext.h" #include "RE_render_ext.h" +#include "RE_shader_ext.h" #include "render_types.h" } #include "PIL_time.h" diff --git a/source/blender/compositor/operations/COM_CompositorOperation.h b/source/blender/compositor/operations/COM_CompositorOperation.h index d24fc49059c..8db8fe00d3c 100644 --- a/source/blender/compositor/operations/COM_CompositorOperation.h +++ b/source/blender/compositor/operations/COM_CompositorOperation.h @@ -18,9 +18,9 @@ #ifndef __COM_COMPOSITOROPERATION_H__ #define __COM_COMPOSITOROPERATION_H__ -#include "COM_NodeOperation.h" #include "BLI_rect.h" #include "BLI_string.h" +#include "COM_NodeOperation.h" struct Scene; diff --git a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp index 704f7cfad39..66043abd951 100644 --- a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp +++ b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp @@ -17,8 +17,8 @@ */ #include "COM_ConvertDepthToRadiusOperation.h" -#include "BLI_math.h" #include "BKE_camera.h" +#include "BLI_math.h" #include "DNA_camera_types.h" ConvertDepthToRadiusOperation::ConvertDepthToRadiusOperation() : NodeOperation() diff --git a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h index f375d6efb8f..7c3e0ed9738 100644 --- a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h +++ b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h @@ -18,9 +18,9 @@ #ifndef __COM_CONVERTDEPTHTORADIUSOPERATION_H__ #define __COM_CONVERTDEPTHTORADIUSOPERATION_H__ +#include "COM_FastGaussianBlurOperation.h" #include "COM_NodeOperation.h" #include "DNA_object_types.h" -#include "COM_FastGaussianBlurOperation.h" /** * this program converts an input color to an output value. * it assumes we are in sRGB color space. diff --git a/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h b/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h index 48880fb2b59..1cb477bc05d 100644 --- a/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h +++ b/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h @@ -18,8 +18,8 @@ #ifndef __COM_DISTANCEYCCMATTEOPERATION_H__ #define __COM_DISTANCEYCCMATTEOPERATION_H__ -#include "COM_MixOperation.h" #include "COM_DistanceRGBMatteOperation.h" +#include "COM_MixOperation.h" /** * this program converts an input color to an output value. diff --git a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp index f872388e3c7..22949a8e6f1 100644 --- a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp +++ b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp @@ -18,8 +18,8 @@ #include <stdlib.h> -#include "COM_DoubleEdgeMaskOperation.h" #include "BLI_math.h" +#include "COM_DoubleEdgeMaskOperation.h" #include "DNA_node_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp index 3058a5990c6..7a6b69d12fa 100644 --- a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp @@ -18,9 +18,9 @@ #include <limits.h> +#include "BLI_utildefines.h" #include "COM_FastGaussianBlurOperation.h" #include "MEM_guardedalloc.h" -#include "BLI_utildefines.h" FastGaussianBlurOperation::FastGaussianBlurOperation() : BlurBaseOperation(COM_DT_COLOR) { diff --git a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h index 4d249778f53..9de75ff53a7 100644 --- a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h +++ b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h @@ -18,8 +18,8 @@ #ifndef __COM_GAUSSIANALPHAXBLUROPERATION_H__ #define __COM_GAUSSIANALPHAXBLUROPERATION_H__ -#include "COM_NodeOperation.h" #include "COM_BlurBaseOperation.h" +#include "COM_NodeOperation.h" class GaussianAlphaXBlurOperation : public BlurBaseOperation { private: diff --git a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h index d31534455bc..44689922bfc 100644 --- a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h +++ b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h @@ -18,8 +18,8 @@ #ifndef __COM_GAUSSIANALPHAYBLUROPERATION_H__ #define __COM_GAUSSIANALPHAYBLUROPERATION_H__ -#include "COM_NodeOperation.h" #include "COM_BlurBaseOperation.h" +#include "COM_NodeOperation.h" class GaussianAlphaYBlurOperation : public BlurBaseOperation { private: diff --git a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h index 99e22cf91c3..3aa380853bd 100644 --- a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h +++ b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h @@ -18,8 +18,8 @@ #ifndef __COM_GAUSSIANBOKEHBLUROPERATION_H__ #define __COM_GAUSSIANBOKEHBLUROPERATION_H__ -#include "COM_NodeOperation.h" #include "COM_BlurBaseOperation.h" +#include "COM_NodeOperation.h" #include "COM_QualityStepHelper.h" class GaussianBokehBlurOperation : public BlurBaseOperation { diff --git a/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp index 29a50f5350a..68cde0d365f 100644 --- a/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp @@ -17,8 +17,8 @@ */ #include "COM_GaussianXBlurOperation.h" -#include "COM_OpenCLDevice.h" #include "BLI_math.h" +#include "COM_OpenCLDevice.h" #include "MEM_guardedalloc.h" extern "C" { diff --git a/source/blender/compositor/operations/COM_GaussianXBlurOperation.h b/source/blender/compositor/operations/COM_GaussianXBlurOperation.h index 3ebe52cfcce..c5c08df8ce7 100644 --- a/source/blender/compositor/operations/COM_GaussianXBlurOperation.h +++ b/source/blender/compositor/operations/COM_GaussianXBlurOperation.h @@ -18,8 +18,8 @@ #ifndef __COM_GAUSSIANXBLUROPERATION_H__ #define __COM_GAUSSIANXBLUROPERATION_H__ -#include "COM_NodeOperation.h" #include "COM_BlurBaseOperation.h" +#include "COM_NodeOperation.h" class GaussianXBlurOperation : public BlurBaseOperation { private: diff --git a/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp index 500e0fbedc3..eeddd98d4a4 100644 --- a/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp @@ -17,8 +17,8 @@ */ #include "COM_GaussianYBlurOperation.h" -#include "COM_OpenCLDevice.h" #include "BLI_math.h" +#include "COM_OpenCLDevice.h" #include "MEM_guardedalloc.h" extern "C" { diff --git a/source/blender/compositor/operations/COM_GaussianYBlurOperation.h b/source/blender/compositor/operations/COM_GaussianYBlurOperation.h index ce8e0a7b781..92154aa7518 100644 --- a/source/blender/compositor/operations/COM_GaussianYBlurOperation.h +++ b/source/blender/compositor/operations/COM_GaussianYBlurOperation.h @@ -18,8 +18,8 @@ #ifndef __COM_GAUSSIANYBLUROPERATION_H__ #define __COM_GAUSSIANYBLUROPERATION_H__ -#include "COM_NodeOperation.h" #include "COM_BlurBaseOperation.h" +#include "COM_NodeOperation.h" class GaussianYBlurOperation : public BlurBaseOperation { private: diff --git a/source/blender/compositor/operations/COM_GlareFogGlowOperation.h b/source/blender/compositor/operations/COM_GlareFogGlowOperation.h index 45067457778..dae0b714e56 100644 --- a/source/blender/compositor/operations/COM_GlareFogGlowOperation.h +++ b/source/blender/compositor/operations/COM_GlareFogGlowOperation.h @@ -18,9 +18,9 @@ #ifndef __COM_GLAREFOGGLOWOPERATION_H__ #define __COM_GLAREFOGGLOWOPERATION_H__ +#include "COM_GlareBaseOperation.h" #include "COM_NodeOperation.h" #include "DNA_node_types.h" -#include "COM_GlareBaseOperation.h" class GlareFogGlowOperation : public GlareBaseOperation { public: diff --git a/source/blender/compositor/operations/COM_GlareGhostOperation.h b/source/blender/compositor/operations/COM_GlareGhostOperation.h index c89c239e4d1..c0b41762c8a 100644 --- a/source/blender/compositor/operations/COM_GlareGhostOperation.h +++ b/source/blender/compositor/operations/COM_GlareGhostOperation.h @@ -18,9 +18,9 @@ #ifndef __COM_GLAREGHOSTOPERATION_H__ #define __COM_GLAREGHOSTOPERATION_H__ +#include "COM_GlareBaseOperation.h" #include "COM_NodeOperation.h" #include "DNA_node_types.h" -#include "COM_GlareBaseOperation.h" class GlareGhostOperation : public GlareBaseOperation { public: diff --git a/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h b/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h index a40dfac86ff..b6e2e499f64 100644 --- a/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h +++ b/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h @@ -18,9 +18,9 @@ #ifndef __COM_GLARESIMPLESTAROPERATION_H__ #define __COM_GLARESIMPLESTAROPERATION_H__ +#include "COM_GlareBaseOperation.h" #include "COM_NodeOperation.h" #include "DNA_node_types.h" -#include "COM_GlareBaseOperation.h" class GlareSimpleStarOperation : public GlareBaseOperation { public: diff --git a/source/blender/compositor/operations/COM_GlareStreaksOperation.h b/source/blender/compositor/operations/COM_GlareStreaksOperation.h index 9150b5e4641..9f137f90b71 100644 --- a/source/blender/compositor/operations/COM_GlareStreaksOperation.h +++ b/source/blender/compositor/operations/COM_GlareStreaksOperation.h @@ -18,9 +18,9 @@ #ifndef __COM_GLARESTREAKSOPERATION_H__ #define __COM_GLARESTREAKSOPERATION_H__ +#include "COM_GlareBaseOperation.h" #include "COM_NodeOperation.h" #include "DNA_node_types.h" -#include "COM_GlareBaseOperation.h" class GlareStreaksOperation : public GlareBaseOperation { public: diff --git a/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h b/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h index 3e212b96521..0624a5c022f 100644 --- a/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h +++ b/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h @@ -18,8 +18,8 @@ #ifndef __COM_HUESATURATIONVALUECORRECTOPERATION_H__ #define __COM_HUESATURATIONVALUECORRECTOPERATION_H__ -#include "COM_NodeOperation.h" #include "COM_CurveBaseOperation.h" +#include "COM_NodeOperation.h" class HueSaturationValueCorrectOperation : public CurveBaseOperation { private: diff --git a/source/blender/compositor/operations/COM_ImageOperation.cpp b/source/blender/compositor/operations/COM_ImageOperation.cpp index 3a60b1c84a3..d70cab4ad2a 100644 --- a/source/blender/compositor/operations/COM_ImageOperation.cpp +++ b/source/blender/compositor/operations/COM_ImageOperation.cpp @@ -18,19 +18,19 @@ #include "COM_ImageOperation.h" -#include "BLI_listbase.h" -#include "DNA_image_types.h" #include "BKE_image.h" #include "BKE_scene.h" +#include "BLI_listbase.h" #include "BLI_math.h" +#include "DNA_image_types.h" extern "C" { -#include "RE_pipeline.h" -#include "RE_shader_ext.h" -#include "RE_render_ext.h" +#include "IMB_colormanagement.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "IMB_colormanagement.h" +#include "RE_pipeline.h" +#include "RE_render_ext.h" +#include "RE_shader_ext.h" } BaseImageOperation::BaseImageOperation() : NodeOperation() diff --git a/source/blender/compositor/operations/COM_ImageOperation.h b/source/blender/compositor/operations/COM_ImageOperation.h index 7eb2471ba67..57656d03092 100644 --- a/source/blender/compositor/operations/COM_ImageOperation.h +++ b/source/blender/compositor/operations/COM_ImageOperation.h @@ -19,15 +19,15 @@ #ifndef __COM_IMAGEOPERATION_H__ #define __COM_IMAGEOPERATION_H__ -#include "COM_NodeOperation.h" -#include "MEM_guardedalloc.h" +#include "BKE_image.h" #include "BLI_listbase.h" #include "BLI_utildefines.h" -#include "BKE_image.h" +#include "COM_NodeOperation.h" +#include "MEM_guardedalloc.h" extern "C" { #include "RE_pipeline.h" -#include "RE_shader_ext.h" #include "RE_render_ext.h" +#include "RE_shader_ext.h" } /** diff --git a/source/blender/compositor/operations/COM_MaskOperation.h b/source/blender/compositor/operations/COM_MaskOperation.h index 531d6ef1b08..45363ea5220 100644 --- a/source/blender/compositor/operations/COM_MaskOperation.h +++ b/source/blender/compositor/operations/COM_MaskOperation.h @@ -19,9 +19,9 @@ #ifndef __COM_MASKOPERATION_H__ #define __COM_MASKOPERATION_H__ +#include "BLI_listbase.h" #include "COM_NodeOperation.h" #include "DNA_mask_types.h" -#include "BLI_listbase.h" #include "IMB_imbuf_types.h" /** diff --git a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp index 967fa7ad653..4f5d7f6f00b 100644 --- a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp +++ b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp @@ -18,8 +18,8 @@ #include "COM_MovieClipAttributeOperation.h" extern "C" { -#include "BKE_tracking.h" #include "BKE_movieclip.h" +#include "BKE_tracking.h" } MovieClipAttributeOperation::MovieClipAttributeOperation() : NodeOperation() { diff --git a/source/blender/compositor/operations/COM_MovieClipOperation.h b/source/blender/compositor/operations/COM_MovieClipOperation.h index 8d2dd99afc0..7ae85eac25e 100644 --- a/source/blender/compositor/operations/COM_MovieClipOperation.h +++ b/source/blender/compositor/operations/COM_MovieClipOperation.h @@ -19,9 +19,9 @@ #ifndef __COM_MOVIECLIPOPERATION_H__ #define __COM_MOVIECLIPOPERATION_H__ +#include "BLI_listbase.h" #include "COM_NodeOperation.h" #include "DNA_movieclip_types.h" -#include "BLI_listbase.h" #include "IMB_imbuf_types.h" /** diff --git a/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp b/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp index be354ba5a12..ec858ee2c19 100644 --- a/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp +++ b/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp @@ -19,8 +19,8 @@ #include "COM_MovieDistortionOperation.h" extern "C" { -#include "BKE_tracking.h" #include "BKE_movieclip.h" +#include "BKE_tracking.h" #include "BLI_linklist.h" } diff --git a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp index 444af5c4cf7..65f4eeeb8bb 100644 --- a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp +++ b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp @@ -16,8 +16,8 @@ * Copyright 2015, Blender Foundation. */ -#include "COM_OutputFileOperation.h" #include "COM_OutputFileMultiViewOperation.h" +#include "COM_OutputFileOperation.h" #include <string.h> @@ -34,8 +34,8 @@ #include "MEM_guardedalloc.h" extern "C" { -#include "IMB_imbuf.h" #include "IMB_colormanagement.h" +#include "IMB_imbuf.h" #include "IMB_imbuf_types.h" } diff --git a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h index 42457475848..609448c0bcb 100644 --- a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h +++ b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h @@ -21,8 +21,8 @@ #include "COM_NodeOperation.h" #include "COM_OutputFileOperation.h" -#include "BLI_rect.h" #include "BLI_path_util.h" +#include "BLI_rect.h" #include "DNA_color_types.h" diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.cpp b/source/blender/compositor/operations/COM_OutputFileOperation.cpp index 334eab6ef95..efe01d0b5cc 100644 --- a/source/blender/compositor/operations/COM_OutputFileOperation.cpp +++ b/source/blender/compositor/operations/COM_OutputFileOperation.cpp @@ -33,8 +33,8 @@ #include "MEM_guardedalloc.h" extern "C" { -#include "IMB_imbuf.h" #include "IMB_colormanagement.h" +#include "IMB_imbuf.h" #include "IMB_imbuf_types.h" } diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.h b/source/blender/compositor/operations/COM_OutputFileOperation.h index 3ffba6b374e..d00d1d0dc0d 100644 --- a/source/blender/compositor/operations/COM_OutputFileOperation.h +++ b/source/blender/compositor/operations/COM_OutputFileOperation.h @@ -20,8 +20,8 @@ #define __COM_OUTPUTFILEOPERATION_H__ #include "COM_NodeOperation.h" -#include "BLI_rect.h" #include "BLI_path_util.h" +#include "BLI_rect.h" #include "DNA_color_types.h" diff --git a/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cpp b/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cpp index 78a83391ed1..07053d01d43 100644 --- a/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cpp +++ b/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cpp @@ -21,10 +21,10 @@ #include "MEM_guardedalloc.h" extern "C" { +#include "BLI_jitter_2d.h" #include "BLI_listbase.h" #include "BLI_math.h" #include "BLI_math_color.h" -#include "BLI_jitter_2d.h" #include "BKE_movieclip.h" #include "BKE_node.h" diff --git a/source/blender/compositor/operations/COM_PreviewOperation.cpp b/source/blender/compositor/operations/COM_PreviewOperation.cpp index b91c3324f87..e9e1b4a8cd9 100644 --- a/source/blender/compositor/operations/COM_PreviewOperation.cpp +++ b/source/blender/compositor/operations/COM_PreviewOperation.cpp @@ -17,21 +17,21 @@ */ #include "COM_PreviewOperation.h" -#include "BLI_listbase.h" #include "BKE_image.h" -#include "WM_api.h" -#include "WM_types.h" -#include "PIL_time.h" -#include "BLI_utildefines.h" +#include "BLI_listbase.h" +#include "BLI_math.h" #include "BLI_math_color.h" +#include "BLI_utildefines.h" #include "COM_defines.h" -#include "BLI_math.h" #include "MEM_guardedalloc.h" +#include "PIL_time.h" +#include "WM_api.h" +#include "WM_types.h" extern "C" { +#include "BKE_node.h" +#include "IMB_colormanagement.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "IMB_colormanagement.h" -#include "BKE_node.h" } PreviewOperation::PreviewOperation(const ColorManagedViewSettings *viewSettings, diff --git a/source/blender/compositor/operations/COM_PreviewOperation.h b/source/blender/compositor/operations/COM_PreviewOperation.h index 6560db727a8..f31bd533971 100644 --- a/source/blender/compositor/operations/COM_PreviewOperation.h +++ b/source/blender/compositor/operations/COM_PreviewOperation.h @@ -18,11 +18,11 @@ #ifndef __COM_PREVIEWOPERATION_H__ #define __COM_PREVIEWOPERATION_H__ +#include "BKE_global.h" +#include "BLI_rect.h" #include "COM_NodeOperation.h" -#include "DNA_image_types.h" #include "DNA_color_types.h" -#include "BLI_rect.h" -#include "BKE_global.h" +#include "DNA_image_types.h" class PreviewOperation : public NodeOperation { protected: diff --git a/source/blender/compositor/operations/COM_ReadBufferOperation.h b/source/blender/compositor/operations/COM_ReadBufferOperation.h index fee6555c3a9..60d064a5582 100644 --- a/source/blender/compositor/operations/COM_ReadBufferOperation.h +++ b/source/blender/compositor/operations/COM_ReadBufferOperation.h @@ -19,9 +19,9 @@ #ifndef __COM_READBUFFEROPERATION_H__ #define __COM_READBUFFEROPERATION_H__ -#include "COM_NodeOperation.h" -#include "COM_MemoryProxy.h" #include "COM_MemoryBuffer.h" +#include "COM_MemoryProxy.h" +#include "COM_NodeOperation.h" class ReadBufferOperation : public NodeOperation { private: diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.cpp b/source/blender/compositor/operations/COM_RenderLayersProg.cpp index 3c0b01874aa..722aab329d7 100644 --- a/source/blender/compositor/operations/COM_RenderLayersProg.cpp +++ b/source/blender/compositor/operations/COM_RenderLayersProg.cpp @@ -18,14 +18,14 @@ #include "COM_RenderLayersProg.h" -#include "BLI_listbase.h" #include "BKE_scene.h" +#include "BLI_listbase.h" #include "DNA_scene_types.h" extern "C" { #include "RE_pipeline.h" -#include "RE_shader_ext.h" #include "RE_render_ext.h" +#include "RE_shader_ext.h" } /* ******** Render Layers Base Prog ******** */ diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.h b/source/blender/compositor/operations/COM_RenderLayersProg.h index c0b759e68ba..cb47725b749 100644 --- a/source/blender/compositor/operations/COM_RenderLayersProg.h +++ b/source/blender/compositor/operations/COM_RenderLayersProg.h @@ -19,11 +19,11 @@ #ifndef __COM_RENDERLAYERSPROG_H__ #define __COM_RENDERLAYERSPROG_H__ -#include "COM_NodeOperation.h" -#include "MEM_guardedalloc.h" -#include "DNA_scene_types.h" #include "BLI_listbase.h" #include "BLI_utildefines.h" +#include "COM_NodeOperation.h" +#include "DNA_scene_types.h" +#include "MEM_guardedalloc.h" extern "C" { #include "RE_pipeline.h" } diff --git a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp index 94224ac77a6..1afc6d9477f 100644 --- a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp +++ b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp @@ -20,8 +20,8 @@ extern "C" { #include "BLI_math.h" -#include "BLI_utildefines.h" #include "BLI_rand.h" +#include "BLI_utildefines.h" #include "PIL_time.h" } diff --git a/source/blender/compositor/operations/COM_SplitOperation.cpp b/source/blender/compositor/operations/COM_SplitOperation.cpp index 437b20d14d4..1862fde2d40 100644 --- a/source/blender/compositor/operations/COM_SplitOperation.cpp +++ b/source/blender/compositor/operations/COM_SplitOperation.cpp @@ -17,11 +17,11 @@ */ #include "COM_SplitOperation.h" -#include "BLI_listbase.h" #include "BKE_image.h" -#include "BLI_utildefines.h" +#include "BLI_listbase.h" #include "BLI_math_color.h" #include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "MEM_guardedalloc.h" extern "C" { diff --git a/source/blender/compositor/operations/COM_TextureOperation.cpp b/source/blender/compositor/operations/COM_TextureOperation.cpp index e09ccbb016a..0a27a6916b7 100644 --- a/source/blender/compositor/operations/COM_TextureOperation.cpp +++ b/source/blender/compositor/operations/COM_TextureOperation.cpp @@ -19,9 +19,9 @@ #include "COM_TextureOperation.h" #include "COM_WorkScheduler.h" +#include "BKE_image.h" #include "BLI_listbase.h" #include "BLI_threads.h" -#include "BKE_image.h" extern "C" { #include "BKE_node.h" diff --git a/source/blender/compositor/operations/COM_TextureOperation.h b/source/blender/compositor/operations/COM_TextureOperation.h index 6b44c11f423..0d06ac0bc27 100644 --- a/source/blender/compositor/operations/COM_TextureOperation.h +++ b/source/blender/compositor/operations/COM_TextureOperation.h @@ -19,14 +19,14 @@ #ifndef __COM_TEXTUREOPERATION_H__ #define __COM_TEXTUREOPERATION_H__ +#include "BLI_listbase.h" #include "COM_NodeOperation.h" #include "DNA_texture_types.h" -#include "BLI_listbase.h" #include "MEM_guardedalloc.h" extern "C" { #include "RE_pipeline.h" -#include "RE_shader_ext.h" #include "RE_render_ext.h" +#include "RE_shader_ext.h" } /** diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.cpp b/source/blender/compositor/operations/COM_VectorBlurOperation.cpp index 80df13966b1..83ae1a0526d 100644 --- a/source/blender/compositor/operations/COM_VectorBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_VectorBlurOperation.cpp @@ -16,9 +16,9 @@ * Copyright 2011, Blender Foundation. */ -#include <string.h> -#include "MEM_guardedalloc.h" #include "BLI_math.h" +#include "MEM_guardedalloc.h" +#include <string.h> extern "C" { #include "BLI_jitter_2d.h" } diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.h b/source/blender/compositor/operations/COM_VectorBlurOperation.h index aedc0d85a50..3caf5c5c8e4 100644 --- a/source/blender/compositor/operations/COM_VectorBlurOperation.h +++ b/source/blender/compositor/operations/COM_VectorBlurOperation.h @@ -19,8 +19,8 @@ #ifndef __COM_VECTORBLUROPERATION_H__ #define __COM_VECTORBLUROPERATION_H__ #include "COM_NodeOperation.h" -#include "DNA_node_types.h" #include "COM_QualityStepHelper.h" +#include "DNA_node_types.h" class VectorBlurOperation : public NodeOperation, public QualityStepHelper { private: diff --git a/source/blender/compositor/operations/COM_VectorCurveOperation.h b/source/blender/compositor/operations/COM_VectorCurveOperation.h index c8575de6aa8..65441dbdfb7 100644 --- a/source/blender/compositor/operations/COM_VectorCurveOperation.h +++ b/source/blender/compositor/operations/COM_VectorCurveOperation.h @@ -18,8 +18,8 @@ #ifndef __COM_VECTORCURVEOPERATION_H__ #define __COM_VECTORCURVEOPERATION_H__ -#include "COM_NodeOperation.h" #include "COM_CurveBaseOperation.h" +#include "COM_NodeOperation.h" class VectorCurveOperation : public CurveBaseOperation { private: diff --git a/source/blender/compositor/operations/COM_ViewerOperation.cpp b/source/blender/compositor/operations/COM_ViewerOperation.cpp index 96c6320ff01..5c32b9962f4 100644 --- a/source/blender/compositor/operations/COM_ViewerOperation.cpp +++ b/source/blender/compositor/operations/COM_ViewerOperation.cpp @@ -17,21 +17,21 @@ */ #include "COM_ViewerOperation.h" -#include "BLI_listbase.h" #include "BKE_image.h" #include "BKE_scene.h" -#include "WM_api.h" -#include "WM_types.h" -#include "PIL_time.h" -#include "BLI_utildefines.h" +#include "BLI_listbase.h" #include "BLI_math_color.h" #include "BLI_math_vector.h" +#include "BLI_utildefines.h" #include "MEM_guardedalloc.h" +#include "PIL_time.h" +#include "WM_api.h" +#include "WM_types.h" extern "C" { +#include "IMB_colormanagement.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "IMB_colormanagement.h" } ViewerOperation::ViewerOperation() : NodeOperation() diff --git a/source/blender/compositor/operations/COM_ViewerOperation.h b/source/blender/compositor/operations/COM_ViewerOperation.h index 9a6239ca32e..aae2e912804 100644 --- a/source/blender/compositor/operations/COM_ViewerOperation.h +++ b/source/blender/compositor/operations/COM_ViewerOperation.h @@ -18,10 +18,10 @@ #ifndef __COM_VIEWEROPERATION_H__ #define __COM_VIEWEROPERATION_H__ +#include "BKE_global.h" +#include "BLI_rect.h" #include "COM_NodeOperation.h" #include "DNA_image_types.h" -#include "BLI_rect.h" -#include "BKE_global.h" class ViewerOperation : public NodeOperation { private: diff --git a/source/blender/compositor/operations/COM_WriteBufferOperation.cpp b/source/blender/compositor/operations/COM_WriteBufferOperation.cpp index 6c5e45472a8..8cc53f8c6a9 100644 --- a/source/blender/compositor/operations/COM_WriteBufferOperation.cpp +++ b/source/blender/compositor/operations/COM_WriteBufferOperation.cpp @@ -17,9 +17,9 @@ */ #include "COM_WriteBufferOperation.h" +#include "COM_OpenCLDevice.h" #include "COM_defines.h" #include <stdio.h> -#include "COM_OpenCLDevice.h" WriteBufferOperation::WriteBufferOperation(DataType datatype) : NodeOperation() { diff --git a/source/blender/compositor/operations/COM_WriteBufferOperation.h b/source/blender/compositor/operations/COM_WriteBufferOperation.h index 83f7ed1ae56..be525db4420 100644 --- a/source/blender/compositor/operations/COM_WriteBufferOperation.h +++ b/source/blender/compositor/operations/COM_WriteBufferOperation.h @@ -19,8 +19,8 @@ #ifndef __COM_WRITEBUFFEROPERATION_H__ #define __COM_WRITEBUFFEROPERATION_H__ -#include "COM_NodeOperation.h" #include "COM_MemoryProxy.h" +#include "COM_NodeOperation.h" #include "COM_SocketReader.h" /** * \brief NodeOperation to write to a tile |