diff options
author | Dalai Felinto <dalai@blender.org> | 2020-03-19 11:33:03 +0300 |
---|---|---|
committer | Dalai Felinto <dalai@blender.org> | 2020-03-19 11:33:58 +0300 |
commit | 2d1cce8331f3ecdfb8cb0c651e111ffac5dc7153 (patch) | |
tree | ec50d7bdca3901a6afcc986943011f08f9516307 /source/blender/compositor/intern | |
parent | 008aaaa37841ca27d2bba80d8859336655cef455 (diff) |
Cleanup: `make format` after SortedIncludes change
Diffstat (limited to 'source/blender/compositor/intern')
16 files changed, 54 insertions, 54 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; |