diff options
Diffstat (limited to 'source/blender/compositor/nodes')
58 files changed, 113 insertions, 113 deletions
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 |