diff options
author | Manuel Castilla <manzanillawork@gmail.com> | 2021-10-14 00:00:24 +0300 |
---|---|---|
committer | Manuel Castilla <manzanillawork@gmail.com> | 2021-10-14 00:41:14 +0300 |
commit | ecb8a574c752068de9f8d9eb98f54db1569df2f7 (patch) | |
tree | 705bed742cf9214af62422701e9ab5eb505849f1 /source | |
parent | 91c33c8b99520b6b094265a826cd391929a81716 (diff) |
Cleanup: remove unused includes in Compositor
And move unneeded includes in frequently used headers
to source files.
Slightly reduces compile time.
Diffstat (limited to 'source')
214 files changed, 118 insertions, 625 deletions
diff --git a/source/blender/compositor/COM_defines.h b/source/blender/compositor/COM_defines.h index 9991414aba4..1c3a28670df 100644 --- a/source/blender/compositor/COM_defines.h +++ b/source/blender/compositor/COM_defines.h @@ -19,8 +19,8 @@ #pragma once #include "BLI_float2.hh" -#include "BLI_index_range.hh" -#include "BLI_rect.h" + +#include "DNA_vec_types.h" namespace blender::compositor { diff --git a/source/blender/compositor/intern/COM_BufferRange.h b/source/blender/compositor/intern/COM_BufferRange.h index ffdf1f2f1e5..7684ae52fab 100644 --- a/source/blender/compositor/intern/COM_BufferRange.h +++ b/source/blender/compositor/intern/COM_BufferRange.h @@ -19,7 +19,6 @@ #pragma once #include "BLI_assert.h" -#include "BLI_rect.h" #include <iterator> diff --git a/source/blender/compositor/intern/COM_CPUDevice.cc b/source/blender/compositor/intern/COM_CPUDevice.cc index 2ca5557e278..dbf813a61b4 100644 --- a/source/blender/compositor/intern/COM_CPUDevice.cc +++ b/source/blender/compositor/intern/COM_CPUDevice.cc @@ -19,8 +19,7 @@ #include "COM_CPUDevice.h" #include "COM_ExecutionGroup.h" - -#include "BLI_rect.h" +#include "COM_NodeOperation.h" namespace blender::compositor { diff --git a/source/blender/compositor/intern/COM_ChunkOrder.cc b/source/blender/compositor/intern/COM_ChunkOrder.cc index a03718d720d..3e0246ce893 100644 --- a/source/blender/compositor/intern/COM_ChunkOrder.cc +++ b/source/blender/compositor/intern/COM_ChunkOrder.cc @@ -16,9 +16,9 @@ * Copyright 2011, Blender Foundation. */ -#include "COM_ChunkOrder.h" +#include <cfloat> -#include "BLI_math.h" +#include "COM_ChunkOrder.h" namespace blender::compositor { diff --git a/source/blender/compositor/intern/COM_CompositorContext.cc b/source/blender/compositor/intern/COM_CompositorContext.cc index f5f490b0bf6..5d8355c181a 100644 --- a/source/blender/compositor/intern/COM_CompositorContext.cc +++ b/source/blender/compositor/intern/COM_CompositorContext.cc @@ -17,11 +17,6 @@ */ #include "COM_CompositorContext.h" -#include "COM_defines.h" -#include <cstdio> - -#include "BLI_assert.h" -#include "DNA_userdef_types.h" namespace blender::compositor { diff --git a/source/blender/compositor/intern/COM_CompositorContext.h b/source/blender/compositor/intern/COM_CompositorContext.h index ae298c5a65a..1ae596736ae 100644 --- a/source/blender/compositor/intern/COM_CompositorContext.h +++ b/source/blender/compositor/intern/COM_CompositorContext.h @@ -18,16 +18,13 @@ #pragma once -#include "BLI_rect.h" - #include "COM_Enums.h" #include "DNA_color_types.h" #include "DNA_node_types.h" #include "DNA_scene_types.h" -#include <string> -#include <vector> +struct bNodeInstanceHash; namespace blender::compositor { diff --git a/source/blender/compositor/intern/COM_ConstantFolder.cc b/source/blender/compositor/intern/COM_ConstantFolder.cc index 445a9ce7433..d3031765eae 100644 --- a/source/blender/compositor/intern/COM_ConstantFolder.cc +++ b/source/blender/compositor/intern/COM_ConstantFolder.cc @@ -16,10 +16,11 @@ * Copyright 2021, Blender Foundation. */ -#include "BLI_rect.h" +#include "BLI_map.hh" +#include "BLI_set.hh" #include "COM_ConstantFolder.h" -#include "COM_ConstantOperation.h" +#include "COM_NodeOperationBuilder.h" #include "COM_SetColorOperation.h" #include "COM_SetValueOperation.h" #include "COM_SetVectorOperation.h" diff --git a/source/blender/compositor/intern/COM_ConstantFolder.h b/source/blender/compositor/intern/COM_ConstantFolder.h index 2432e859a5a..f31cb4f4e78 100644 --- a/source/blender/compositor/intern/COM_ConstantFolder.h +++ b/source/blender/compositor/intern/COM_ConstantFolder.h @@ -18,16 +18,12 @@ #pragma once -#include "BLI_map.hh" -#include "BLI_set.hh" -#include "BLI_vector.hh" - -#include "COM_NodeOperationBuilder.h" #include "COM_defines.h" namespace blender::compositor { class NodeOperation; +class NodeOperationBuilder; class ConstantOperation; class MemoryBuffer; diff --git a/source/blender/compositor/intern/COM_Converter.cc b/source/blender/compositor/intern/COM_Converter.cc index ee77beb8a82..346c3c4b600 100644 --- a/source/blender/compositor/intern/COM_Converter.cc +++ b/source/blender/compositor/intern/COM_Converter.cc @@ -22,7 +22,6 @@ #include "BKE_node.h" -#include "COM_NodeOperation.h" #include "COM_NodeOperationBuilder.h" #include "COM_AlphaOverNode.h" @@ -62,7 +61,6 @@ #include "COM_DistanceMatteNode.h" #include "COM_DoubleEdgeMaskNode.h" #include "COM_EllipseMaskNode.h" -#include "COM_ExecutionSystem.h" #include "COM_FilterNode.h" #include "COM_FlipNode.h" #include "COM_GammaNode.h" diff --git a/source/blender/compositor/intern/COM_Converter.h b/source/blender/compositor/intern/COM_Converter.h index 7f0402d4e70..9cb6b1862b2 100644 --- a/source/blender/compositor/intern/COM_Converter.h +++ b/source/blender/compositor/intern/COM_Converter.h @@ -18,8 +18,6 @@ #pragma once -#include "COM_NodeOperation.h" - #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" #endif @@ -29,6 +27,7 @@ struct bNode; namespace blender::compositor { class Node; +class NodeOperation; class NodeOperationInput; class NodeOperationOutput; class NodeOperationBuilder; diff --git a/source/blender/compositor/intern/COM_Debug.cc b/source/blender/compositor/intern/COM_Debug.cc index 9e47aa9fcb5..d0c8311ef6e 100644 --- a/source/blender/compositor/intern/COM_Debug.cc +++ b/source/blender/compositor/intern/COM_Debug.cc @@ -18,26 +18,16 @@ #include "COM_Debug.h" -#include <map> -#include <typeinfo> -#include <vector> - extern "C" { #include "BLI_fileops.h" #include "BLI_path_util.h" -#include "BLI_string.h" -#include "BLI_sys_types.h" #include "BKE_appdir.h" -#include "BKE_node.h" -#include "DNA_node_types.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" } -#include "COM_ExecutionSystem.h" -#include "COM_Node.h" - +#include "COM_ExecutionGroup.h" #include "COM_ReadBufferOperation.h" #include "COM_SetValueOperation.h" #include "COM_ViewerOperation.h" diff --git a/source/blender/compositor/intern/COM_Debug.h b/source/blender/compositor/intern/COM_Debug.h index 23d99c7e529..689cd4029f1 100644 --- a/source/blender/compositor/intern/COM_Debug.h +++ b/source/blender/compositor/intern/COM_Debug.h @@ -21,9 +21,11 @@ #include <map> #include <string> +#include "BLI_vector.hh" + #include "COM_ExecutionSystem.h" -#include "COM_NodeOperation.h" -#include "COM_defines.h" +#include "COM_MemoryBuffer.h" +#include "COM_Node.h" namespace blender::compositor { @@ -34,6 +36,7 @@ static constexpr bool COM_GRAPHVIZ_SHOW_NODE_NAME = false; static constexpr bool COM_EXPORT_OPERATION_BUFFERS = false; class Node; +class NodeOperation; class ExecutionSystem; class ExecutionGroup; diff --git a/source/blender/compositor/intern/COM_Device.h b/source/blender/compositor/intern/COM_Device.h index c848672a405..1e3618e6c5e 100644 --- a/source/blender/compositor/intern/COM_Device.h +++ b/source/blender/compositor/intern/COM_Device.h @@ -18,10 +18,10 @@ #pragma once -#include "COM_WorkPackage.h" - namespace blender::compositor { +struct WorkPackage; + /** * \brief Abstract class for device implementations to be used by the Compositor. * devices are queried, initialized and used by the WorkScheduler. diff --git a/source/blender/compositor/intern/COM_Enums.cc b/source/blender/compositor/intern/COM_Enums.cc index 2f20d2652ba..63a5a78436b 100644 --- a/source/blender/compositor/intern/COM_Enums.cc +++ b/source/blender/compositor/intern/COM_Enums.cc @@ -17,7 +17,6 @@ */ #include "COM_Enums.h" -#include "BLI_rect.h" namespace blender::compositor { diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.cc b/source/blender/compositor/intern/COM_ExecutionGroup.cc index 505a4066a25..655bc030dec 100644 --- a/source/blender/compositor/intern/COM_ExecutionGroup.cc +++ b/source/blender/compositor/intern/COM_ExecutionGroup.cc @@ -16,36 +16,21 @@ * Copyright 2011, Blender Foundation. */ -#include <algorithm> -#include <cmath> -#include <cstdlib> -#include <sstream> - -#include "atomic_ops.h" - +#include "COM_ExecutionGroup.h" #include "COM_ChunkOrder.h" #include "COM_Debug.h" -#include "COM_ExecutionGroup.h" -#include "COM_ExecutionSystem.h" #include "COM_ReadBufferOperation.h" #include "COM_ViewerOperation.h" #include "COM_WorkScheduler.h" #include "COM_WriteBufferOperation.h" #include "COM_defines.h" -#include "BLI_math.h" #include "BLI_rand.hh" -#include "BLI_string.h" #include "BLT_translation.h" -#include "MEM_guardedalloc.h" - #include "PIL_time.h" -#include "WM_api.h" -#include "WM_types.h" - namespace blender::compositor { std::ostream &operator<<(std::ostream &os, const ExecutionGroupFlags &flags) diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.h b/source/blender/compositor/intern/COM_ExecutionGroup.h index cb593feabb0..58386c959a4 100644 --- a/source/blender/compositor/intern/COM_ExecutionGroup.h +++ b/source/blender/compositor/intern/COM_ExecutionGroup.h @@ -22,25 +22,24 @@ # include "MEM_guardedalloc.h" #endif +#include <iostream> + #include "BLI_array.hh" -#include "BLI_rect.h" #include "BLI_vector.hh" -#include "COM_CompositorContext.h" -#include "COM_Device.h" -#include "COM_MemoryProxy.h" -#include "COM_Node.h" -#include "COM_NodeOperation.h" +#include "COM_Enums.h" #include "COM_WorkPackage.h" -#include <vector> + +#include "DNA_node_types.h" +#include "DNA_vec_types.h" namespace blender::compositor { class ExecutionSystem; +class NodeOperation; class MemoryProxy; class MemoryBuffer; class ReadBufferOperation; -class Device; struct ExecutionGroupFlags { bool initialized : 1; diff --git a/source/blender/compositor/intern/COM_ExecutionModel.cc b/source/blender/compositor/intern/COM_ExecutionModel.cc index b75b277e92c..0ac99152c9f 100644 --- a/source/blender/compositor/intern/COM_ExecutionModel.cc +++ b/source/blender/compositor/intern/COM_ExecutionModel.cc @@ -17,6 +17,7 @@ */ #include "COM_ExecutionModel.h" +#include "COM_CompositorContext.h" namespace blender::compositor { diff --git a/source/blender/compositor/intern/COM_ExecutionModel.h b/source/blender/compositor/intern/COM_ExecutionModel.h index 452861ae4be..f0adc7d3e54 100644 --- a/source/blender/compositor/intern/COM_ExecutionModel.h +++ b/source/blender/compositor/intern/COM_ExecutionModel.h @@ -18,12 +18,9 @@ #pragma once -#include "BLI_rect.h" -#include "BLI_vector.hh" +#include "BLI_span.hh" -#include "COM_ExecutionSystem.h" - -#include <functional> +#include "DNA_vec_types.h" #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" @@ -31,6 +28,8 @@ namespace blender::compositor { +class CompositorContext; +class ExecutionSystem; class NodeOperation; /** diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.cc b/source/blender/compositor/intern/COM_ExecutionSystem.cc index c92e292c74f..9b1ec823f75 100644 --- a/source/blender/compositor/intern/COM_ExecutionSystem.cc +++ b/source/blender/compositor/intern/COM_ExecutionSystem.cc @@ -18,14 +18,13 @@ #include "COM_ExecutionSystem.h" -#include "BLI_utildefines.h" -#include "PIL_time.h" - #include "COM_Debug.h" +#include "COM_ExecutionGroup.h" #include "COM_FullFrameExecutionModel.h" #include "COM_NodeOperation.h" #include "COM_NodeOperationBuilder.h" #include "COM_TiledExecutionModel.h" +#include "COM_WorkPackage.h" #include "COM_WorkScheduler.h" #ifdef WITH_CXX_GUARDEDALLOC diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.h b/source/blender/compositor/intern/COM_ExecutionSystem.h index bce96db52c7..eb0ad805217 100644 --- a/source/blender/compositor/intern/COM_ExecutionSystem.h +++ b/source/blender/compositor/intern/COM_ExecutionSystem.h @@ -16,22 +16,23 @@ * Copyright 2011, Blender Foundation. */ -class ExecutionGroup; - #pragma once -#include "BKE_text.h" +#include <functional> + +#include "atomic_ops.h" + +#include "BLI_index_range.hh" +#include "BLI_threads.h" +#include "BLI_vector.hh" -#include "COM_ExecutionGroup.h" -#include "COM_Node.h" -#include "COM_NodeOperation.h" +#include "COM_CompositorContext.h" #include "COM_SharedOperationBuffers.h" #include "DNA_color_types.h" #include "DNA_node_types.h" - -#include "BLI_vector.hh" -#include "atomic_ops.h" +#include "DNA_scene_types.h" +#include "DNA_vec_types.h" namespace blender::compositor { @@ -118,7 +119,9 @@ namespace blender::compositor { */ /* Forward declarations. */ +class ExecutionGroup; class ExecutionModel; +class NodeOperation; /** * \brief the ExecutionSystem contains the whole compositor tree. diff --git a/source/blender/compositor/intern/COM_FullFrameExecutionModel.cc b/source/blender/compositor/intern/COM_FullFrameExecutionModel.cc index c44a168390b..ce00fff5858 100644 --- a/source/blender/compositor/intern/COM_FullFrameExecutionModel.cc +++ b/source/blender/compositor/intern/COM_FullFrameExecutionModel.cc @@ -17,14 +17,13 @@ */ #include "COM_FullFrameExecutionModel.h" + +#include "BLT_translation.h" + #include "COM_Debug.h" -#include "COM_ExecutionGroup.h" -#include "COM_ReadBufferOperation.h" #include "COM_ViewerOperation.h" #include "COM_WorkScheduler.h" -#include "BLT_translation.h" - #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" #endif diff --git a/source/blender/compositor/intern/COM_FullFrameExecutionModel.h b/source/blender/compositor/intern/COM_FullFrameExecutionModel.h index 66dfb8f052c..36d42886c27 100644 --- a/source/blender/compositor/intern/COM_FullFrameExecutionModel.h +++ b/source/blender/compositor/intern/COM_FullFrameExecutionModel.h @@ -18,6 +18,9 @@ #pragma once +#include "BLI_vector.hh" + +#include "COM_Enums.h" #include "COM_ExecutionModel.h" #ifdef WITH_CXX_GUARDEDALLOC @@ -27,7 +30,11 @@ namespace blender::compositor { /* Forward declarations. */ -class ExecutionGroup; +class CompositorContext; +class ExecutionSystem; +class MemoryBuffer; +class NodeOperation; +class SharedOperationBuffers; /** * Fully renders operations in order from inputs to outputs. diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.cc b/source/blender/compositor/intern/COM_MemoryBuffer.cc index f57f0f055bf..b80be46d46a 100644 --- a/source/blender/compositor/intern/COM_MemoryBuffer.cc +++ b/source/blender/compositor/intern/COM_MemoryBuffer.cc @@ -18,9 +18,10 @@ #include "COM_MemoryBuffer.h" +#include "COM_MemoryProxy.h" + #include "IMB_colormanagement.h" #include "IMB_imbuf_types.h" -#include "MEM_guardedalloc.h" #define ASSERT_BUFFER_CONTAINS_AREA(buf, area) \ BLI_assert(BLI_rcti_inside_rcti(&(buf)->get_rect(), &(area))) diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.h b/source/blender/compositor/intern/COM_MemoryBuffer.h index 9e173f73f63..1eafc42ea69 100644 --- a/source/blender/compositor/intern/COM_MemoryBuffer.h +++ b/source/blender/compositor/intern/COM_MemoryBuffer.h @@ -21,12 +21,13 @@ #include "COM_BufferArea.h" #include "COM_BufferRange.h" #include "COM_BuffersIterator.h" -#include "COM_ExecutionGroup.h" -#include "COM_MemoryProxy.h" +#include "COM_Enums.h" -#include "BLI_math.h" +#include "BLI_math_interp.h" #include "BLI_rect.h" +struct ImBuf; + namespace blender::compositor { /** diff --git a/source/blender/compositor/intern/COM_MemoryProxy.cc b/source/blender/compositor/intern/COM_MemoryProxy.cc index 6023850c944..58dea234ced 100644 --- a/source/blender/compositor/intern/COM_MemoryProxy.cc +++ b/source/blender/compositor/intern/COM_MemoryProxy.cc @@ -17,11 +17,8 @@ */ #include "COM_MemoryProxy.h" - #include "COM_MemoryBuffer.h" -#include "BLI_rect.h" - namespace blender::compositor { MemoryProxy::MemoryProxy(DataType datatype) diff --git a/source/blender/compositor/intern/COM_MetaData.cc b/source/blender/compositor/intern/COM_MetaData.cc index a6fb84dfb87..5775a7eab65 100644 --- a/source/blender/compositor/intern/COM_MetaData.cc +++ b/source/blender/compositor/intern/COM_MetaData.cc @@ -22,8 +22,6 @@ #include "RE_pipeline.h" -#include <string_view> - namespace blender::compositor { void MetaData::add(const blender::StringRef key, const blender::StringRef value) diff --git a/source/blender/compositor/intern/COM_MultiThreadedRowOperation.h b/source/blender/compositor/intern/COM_MultiThreadedRowOperation.h index 3daa9eec474..c1835e85949 100644 --- a/source/blender/compositor/intern/COM_MultiThreadedRowOperation.h +++ b/source/blender/compositor/intern/COM_MultiThreadedRowOperation.h @@ -18,6 +18,8 @@ #pragma once +#include "BLI_array.h" + #include "COM_MultiThreadedOperation.h" namespace blender::compositor { diff --git a/source/blender/compositor/intern/COM_Node.cc b/source/blender/compositor/intern/COM_Node.cc index 6ac48e3646c..2cd56c1d7c1 100644 --- a/source/blender/compositor/intern/COM_Node.cc +++ b/source/blender/compositor/intern/COM_Node.cc @@ -16,20 +16,10 @@ * Copyright 2011, Blender Foundation. */ -#include <cstring> - #include "BKE_node.h" #include "RNA_access.h" -#include "COM_ExecutionSystem.h" -#include "COM_NodeOperation.h" -#include "COM_TranslateOperation.h" - -#include "COM_SocketProxyNode.h" - -#include "COM_defines.h" - #include "COM_Node.h" /* own include */ namespace blender::compositor { diff --git a/source/blender/compositor/intern/COM_Node.h b/source/blender/compositor/intern/COM_Node.h index 28b59397af9..08d0b9a4fd5 100644 --- a/source/blender/compositor/intern/COM_Node.h +++ b/source/blender/compositor/intern/COM_Node.h @@ -22,9 +22,6 @@ #include "DNA_node_types.h" -#include <algorithm> -#include <string> - /* common node includes * added here so node files don't have to include themselves */ diff --git a/source/blender/compositor/intern/COM_NodeConverter.cc b/source/blender/compositor/intern/COM_NodeConverter.cc index 49a2e7988c4..73f64c7cfd4 100644 --- a/source/blender/compositor/intern/COM_NodeConverter.cc +++ b/source/blender/compositor/intern/COM_NodeConverter.cc @@ -18,9 +18,7 @@ #include "BLI_utildefines.h" -#include "COM_Debug.h" - -#include "COM_NodeOperation.h" +#include "COM_Node.h" #include "COM_NodeOperationBuilder.h" #include "COM_SetColorOperation.h" #include "COM_SetValueOperation.h" diff --git a/source/blender/compositor/intern/COM_NodeGraph.cc b/source/blender/compositor/intern/COM_NodeGraph.cc index 1872fbcf656..0c94dfce409 100644 --- a/source/blender/compositor/intern/COM_NodeGraph.cc +++ b/source/blender/compositor/intern/COM_NodeGraph.cc @@ -18,17 +18,12 @@ #include <cstring> -#include "BLI_listbase.h" -#include "BLI_utildefines.h" - #include "DNA_node_types.h" #include "BKE_node.h" -#include "COM_CompositorContext.h" #include "COM_Converter.h" #include "COM_Debug.h" -#include "COM_Node.h" #include "COM_SocketProxyNode.h" #include "COM_NodeGraph.h" /* own include */ diff --git a/source/blender/compositor/intern/COM_NodeGraph.h b/source/blender/compositor/intern/COM_NodeGraph.h index dfcc6c2fcf9..12aca8f6069 100644 --- a/source/blender/compositor/intern/COM_NodeGraph.h +++ b/source/blender/compositor/intern/COM_NodeGraph.h @@ -18,11 +18,6 @@ #pragma once -#include "BLI_vector.hh" - -#include <map> -#include <set> - #include "DNA_node_types.h" #ifdef WITH_CXX_GUARDEDALLOC diff --git a/source/blender/compositor/intern/COM_NodeOperation.cc b/source/blender/compositor/intern/COM_NodeOperation.cc index a6a395261f2..a34fdd64da9 100644 --- a/source/blender/compositor/intern/COM_NodeOperation.cc +++ b/source/blender/compositor/intern/COM_NodeOperation.cc @@ -17,13 +17,10 @@ */ #include <cstdio> -#include <memory> -#include <typeinfo> #include "COM_BufferOperation.h" #include "COM_ExecutionSystem.h" #include "COM_ReadBufferOperation.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 f507665bee3..0483090d8ca 100644 --- a/source/blender/compositor/intern/COM_NodeOperation.h +++ b/source/blender/compositor/intern/COM_NodeOperation.h @@ -18,32 +18,32 @@ #pragma once +#include <functional> #include <list> -#include <sstream> -#include <string> #include "BLI_ghash.h" #include "BLI_hash.hh" -#include "BLI_math_color.h" -#include "BLI_math_vector.h" +#include "BLI_rect.h" +#include "BLI_span.hh" #include "BLI_threads.h" +#include "BLI_utildefines.h" #include "COM_Enums.h" #include "COM_MemoryBuffer.h" -#include "COM_MemoryProxy.h" #include "COM_MetaData.h" -#include "COM_Node.h" #include "clew.h" +#include "DNA_node_types.h" + namespace blender::compositor { class OpenCLDevice; class ReadBufferOperation; -class WriteBufferOperation; class ExecutionSystem; - class NodeOperation; +class NodeOperationOutput; + typedef NodeOperation SocketReader; /** diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.cc b/source/blender/compositor/intern/COM_NodeOperationBuilder.cc index acb7f61f6dd..2801cb401be 100644 --- a/source/blender/compositor/intern/COM_NodeOperationBuilder.cc +++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.cc @@ -16,24 +16,19 @@ * Copyright 2013, Blender Foundation. */ +#include <set> + #include "BLI_multi_value_map.hh" -#include "BLI_utildefines.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_ExecutionGroup.h" #include "COM_PreviewOperation.h" #include "COM_ReadBufferOperation.h" #include "COM_SetColorOperation.h" #include "COM_SetValueOperation.h" #include "COM_SetVectorOperation.h" -#include "COM_SocketProxyOperation.h" -#include "COM_TranslateOperation.h" #include "COM_ViewerOperation.h" #include "COM_WriteBufferOperation.h" diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.h b/source/blender/compositor/intern/COM_NodeOperationBuilder.h index 1f9c86b51cd..a6a6201bbb5 100644 --- a/source/blender/compositor/intern/COM_NodeOperationBuilder.h +++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.h @@ -18,9 +18,8 @@ #pragma once -#include <map> -#include <set> -#include <vector> +#include "BLI_map.hh" +#include "BLI_vector.hh" #include "COM_NodeGraph.h" diff --git a/source/blender/compositor/intern/COM_OpenCLDevice.cc b/source/blender/compositor/intern/COM_OpenCLDevice.cc index 3409c8fa3bc..815bac4009e 100644 --- a/source/blender/compositor/intern/COM_OpenCLDevice.cc +++ b/source/blender/compositor/intern/COM_OpenCLDevice.cc @@ -17,7 +17,9 @@ */ #include "COM_OpenCLDevice.h" -#include "COM_WorkScheduler.h" + +#include "COM_ExecutionGroup.h" +#include "COM_ReadBufferOperation.h" namespace blender::compositor { diff --git a/source/blender/compositor/intern/COM_OpenCLDevice.h b/source/blender/compositor/intern/COM_OpenCLDevice.h index 826b0457a49..3de9d01c28c 100644 --- a/source/blender/compositor/intern/COM_OpenCLDevice.h +++ b/source/blender/compositor/intern/COM_OpenCLDevice.h @@ -20,13 +20,20 @@ class OpenCLDevice; #pragma once +#include <list> + #include "COM_Device.h" -#include "COM_ReadBufferOperation.h" -#include "COM_WorkScheduler.h" + #include "clew.h" namespace blender::compositor { +class NodeOperation; +class MemoryBuffer; +class ReadBufferOperation; + +typedef NodeOperation SocketReader; + /** * \brief device representing an GPU OpenCL device. * an instance of this class represents a single cl_device diff --git a/source/blender/compositor/intern/COM_SharedOperationBuffers.cc b/source/blender/compositor/intern/COM_SharedOperationBuffers.cc index 55153bd4f0a..c67251b2d20 100644 --- a/source/blender/compositor/intern/COM_SharedOperationBuffers.cc +++ b/source/blender/compositor/intern/COM_SharedOperationBuffers.cc @@ -17,7 +17,6 @@ */ #include "COM_SharedOperationBuffers.h" -#include "BLI_rect.h" #include "COM_NodeOperation.h" namespace blender::compositor { diff --git a/source/blender/compositor/intern/COM_SharedOperationBuffers.h b/source/blender/compositor/intern/COM_SharedOperationBuffers.h index 4461ba75cbe..d7d0dffabb5 100644 --- a/source/blender/compositor/intern/COM_SharedOperationBuffers.h +++ b/source/blender/compositor/intern/COM_SharedOperationBuffers.h @@ -19,16 +19,19 @@ #pragma once #include "BLI_map.hh" -#include "BLI_span.hh" #include "BLI_vector.hh" -#include "COM_MemoryBuffer.h" + +#include "DNA_vec_types.h" + #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" #endif -#include <memory> namespace blender::compositor { +class MemoryBuffer; +class NodeOperation; + /** * Stores and shares operations rendered buffers including render data. Buffers are * disposed once all dependent operations have finished reading them. diff --git a/source/blender/compositor/intern/COM_TiledExecutionModel.h b/source/blender/compositor/intern/COM_TiledExecutionModel.h index 05a795b9f07..1f5345241e2 100644 --- a/source/blender/compositor/intern/COM_TiledExecutionModel.h +++ b/source/blender/compositor/intern/COM_TiledExecutionModel.h @@ -18,6 +18,7 @@ #pragma once +#include "COM_Enums.h" #include "COM_ExecutionModel.h" #ifdef WITH_CXX_GUARDEDALLOC diff --git a/source/blender/compositor/intern/COM_WorkPackage.cc b/source/blender/compositor/intern/COM_WorkPackage.cc index ea78c0d6333..7db44226574 100644 --- a/source/blender/compositor/intern/COM_WorkPackage.cc +++ b/source/blender/compositor/intern/COM_WorkPackage.cc @@ -18,7 +18,6 @@ #include "COM_WorkPackage.h" -#include "COM_Enums.h" #include "COM_ExecutionGroup.h" namespace blender::compositor { diff --git a/source/blender/compositor/intern/COM_WorkPackage.h b/source/blender/compositor/intern/COM_WorkPackage.h index 20fca89aa4c..5ea3237d412 100644 --- a/source/blender/compositor/intern/COM_WorkPackage.h +++ b/source/blender/compositor/intern/COM_WorkPackage.h @@ -24,7 +24,7 @@ #include "COM_Enums.h" -#include "BLI_rect.h" +#include "DNA_vec_types.h" #include <functional> #include <ostream> diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cc b/source/blender/compositor/intern/COM_WorkScheduler.cc index a08f9dd284c..22f60ec17fe 100644 --- a/source/blender/compositor/intern/COM_WorkScheduler.cc +++ b/source/blender/compositor/intern/COM_WorkScheduler.cc @@ -16,15 +16,14 @@ * Copyright 2011, Blender Foundation. */ -#include <cstdio> -#include <list> +#include "COM_WorkScheduler.h" #include "COM_CPUDevice.h" +#include "COM_CompositorContext.h" +#include "COM_ExecutionGroup.h" #include "COM_OpenCLDevice.h" #include "COM_OpenCLKernels.cl.h" -#include "COM_WorkScheduler.h" #include "COM_WriteBufferOperation.h" -#include "COM_compositor.h" #include "clew.h" @@ -33,7 +32,6 @@ #include "BLI_task.h" #include "BLI_threads.h" #include "BLI_vector.hh" -#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 297943aa63b..d0fa3286a3b 100644 --- a/source/blender/compositor/intern/COM_WorkScheduler.h +++ b/source/blender/compositor/intern/COM_WorkScheduler.h @@ -18,13 +18,11 @@ #pragma once -#include "COM_ExecutionGroup.h" +namespace blender::compositor { -#include "COM_Device.h" -#include "COM_WorkPackage.h" -#include "COM_defines.h" +struct WorkPackage; -namespace blender::compositor { +class CompositorContext; /** \brief the workscheduler * \ingroup execution diff --git a/source/blender/compositor/intern/COM_compositor.cc b/source/blender/compositor/intern/COM_compositor.cc index c05234f3bd0..ed32a477384 100644 --- a/source/blender/compositor/intern/COM_compositor.cc +++ b/source/blender/compositor/intern/COM_compositor.cc @@ -24,10 +24,8 @@ #include "BKE_scene.h" #include "COM_ExecutionSystem.h" -#include "COM_MovieDistortionOperation.h" #include "COM_WorkScheduler.h" #include "COM_compositor.h" -#include "clew.h" static struct { bool is_initialized = false; diff --git a/source/blender/compositor/nodes/COM_AlphaOverNode.cc b/source/blender/compositor/nodes/COM_AlphaOverNode.cc index c9038886b0d..603f713a43f 100644 --- a/source/blender/compositor/nodes/COM_AlphaOverNode.cc +++ b/source/blender/compositor/nodes/COM_AlphaOverNode.cc @@ -21,10 +21,6 @@ #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 */ namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_AntiAliasingNode.cc b/source/blender/compositor/nodes/COM_AntiAliasingNode.cc index af4832665df..8cbb3994939 100644 --- a/source/blender/compositor/nodes/COM_AntiAliasingNode.cc +++ b/source/blender/compositor/nodes/COM_AntiAliasingNode.cc @@ -20,7 +20,6 @@ #include "COM_AntiAliasingNode.h" #include "COM_SMAAOperation.h" -#include "DNA_node_types.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_BilateralBlurNode.cc b/source/blender/compositor/nodes/COM_BilateralBlurNode.cc index 1b9da789d3c..40a70e37e4b 100644 --- a/source/blender/compositor/nodes/COM_BilateralBlurNode.cc +++ b/source/blender/compositor/nodes/COM_BilateralBlurNode.cc @@ -18,8 +18,6 @@ #include "COM_BilateralBlurNode.h" #include "COM_BilateralBlurOperation.h" -#include "COM_ExecutionSystem.h" -#include "DNA_node_types.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_BlurNode.cc b/source/blender/compositor/nodes/COM_BlurNode.cc index c10bc2a05f0..5dfd5c8d0bc 100644 --- a/source/blender/compositor/nodes/COM_BlurNode.cc +++ b/source/blender/compositor/nodes/COM_BlurNode.cc @@ -17,7 +17,6 @@ */ #include "COM_BlurNode.h" -#include "COM_ExecutionSystem.h" #include "COM_FastGaussianBlurOperation.h" #include "COM_GammaCorrectOperation.h" #include "COM_GaussianAlphaXBlurOperation.h" @@ -27,7 +26,6 @@ #include "COM_GaussianYBlurOperation.h" #include "COM_MathBaseOperation.h" #include "COM_SetValueOperation.h" -#include "DNA_node_types.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_BokehBlurNode.cc b/source/blender/compositor/nodes/COM_BokehBlurNode.cc index c51a98c0f82..c18f6351cbd 100644 --- a/source/blender/compositor/nodes/COM_BokehBlurNode.cc +++ b/source/blender/compositor/nodes/COM_BokehBlurNode.cc @@ -18,12 +18,7 @@ #include "COM_BokehBlurNode.h" #include "COM_BokehBlurOperation.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" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_BokehImageNode.cc b/source/blender/compositor/nodes/COM_BokehImageNode.cc index 2b0a47c76bc..64237571e90 100644 --- a/source/blender/compositor/nodes/COM_BokehImageNode.cc +++ b/source/blender/compositor/nodes/COM_BokehImageNode.cc @@ -18,7 +18,6 @@ #include "COM_BokehImageNode.h" #include "COM_BokehImageOperation.h" -#include "COM_ExecutionSystem.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_BoxMaskNode.cc b/source/blender/compositor/nodes/COM_BoxMaskNode.cc index 8017e063a69..6fcaeada406 100644 --- a/source/blender/compositor/nodes/COM_BoxMaskNode.cc +++ b/source/blender/compositor/nodes/COM_BoxMaskNode.cc @@ -18,7 +18,6 @@ #include "COM_BoxMaskNode.h" #include "COM_BoxMaskOperation.h" -#include "COM_ExecutionSystem.h" #include "COM_ScaleOperation.h" #include "COM_SetValueOperation.h" diff --git a/source/blender/compositor/nodes/COM_BrightnessNode.cc b/source/blender/compositor/nodes/COM_BrightnessNode.cc index b64f1fea99f..e01ec3d8729 100644 --- a/source/blender/compositor/nodes/COM_BrightnessNode.cc +++ b/source/blender/compositor/nodes/COM_BrightnessNode.cc @@ -18,7 +18,6 @@ #include "COM_BrightnessNode.h" #include "COM_BrightnessOperation.h" -#include "COM_ExecutionSystem.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_ChannelMatteNode.cc b/source/blender/compositor/nodes/COM_ChannelMatteNode.cc index d0f72274aea..ed49d9c36a9 100644 --- a/source/blender/compositor/nodes/COM_ChannelMatteNode.cc +++ b/source/blender/compositor/nodes/COM_ChannelMatteNode.cc @@ -17,7 +17,6 @@ */ #include "COM_ChannelMatteNode.h" -#include "BKE_node.h" #include "COM_ChannelMatteOperation.h" #include "COM_ConvertOperation.h" #include "COM_SetAlphaMultiplyOperation.h" diff --git a/source/blender/compositor/nodes/COM_ChromaMatteNode.cc b/source/blender/compositor/nodes/COM_ChromaMatteNode.cc index 9abf183a843..33516181152 100644 --- a/source/blender/compositor/nodes/COM_ChromaMatteNode.cc +++ b/source/blender/compositor/nodes/COM_ChromaMatteNode.cc @@ -17,7 +17,6 @@ */ #include "COM_ChromaMatteNode.h" -#include "BKE_node.h" #include "COM_ChromaMatteOperation.h" #include "COM_ConvertOperation.h" #include "COM_SetAlphaMultiplyOperation.h" diff --git a/source/blender/compositor/nodes/COM_ColorBalanceNode.cc b/source/blender/compositor/nodes/COM_ColorBalanceNode.cc index 03e4e143061..8f9d05ad1e1 100644 --- a/source/blender/compositor/nodes/COM_ColorBalanceNode.cc +++ b/source/blender/compositor/nodes/COM_ColorBalanceNode.cc @@ -17,11 +17,8 @@ */ #include "COM_ColorBalanceNode.h" -#include "BKE_node.h" #include "COM_ColorBalanceASCCDLOperation.h" #include "COM_ColorBalanceLGGOperation.h" -#include "COM_ExecutionSystem.h" -#include "COM_MixOperation.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_ColorCorrectionNode.cc b/source/blender/compositor/nodes/COM_ColorCorrectionNode.cc index 6397b1d8e4b..b5bf118d7de 100644 --- a/source/blender/compositor/nodes/COM_ColorCorrectionNode.cc +++ b/source/blender/compositor/nodes/COM_ColorCorrectionNode.cc @@ -18,7 +18,6 @@ #include "COM_ColorCorrectionNode.h" #include "COM_ColorCorrectionOperation.h" -#include "COM_ExecutionSystem.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_ColorCurveNode.cc b/source/blender/compositor/nodes/COM_ColorCurveNode.cc index 774dd689a46..4a82a42b036 100644 --- a/source/blender/compositor/nodes/COM_ColorCurveNode.cc +++ b/source/blender/compositor/nodes/COM_ColorCurveNode.cc @@ -18,7 +18,6 @@ #include "COM_ColorCurveNode.h" #include "COM_ColorCurveOperation.h" -#include "COM_ExecutionSystem.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_ColorExposureNode.cc b/source/blender/compositor/nodes/COM_ColorExposureNode.cc index a8f164e6b66..83507395108 100644 --- a/source/blender/compositor/nodes/COM_ColorExposureNode.cc +++ b/source/blender/compositor/nodes/COM_ColorExposureNode.cc @@ -18,7 +18,6 @@ #include "COM_ColorExposureNode.h" #include "COM_ColorExposureOperation.h" -#include "COM_ExecutionSystem.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_ColorMatteNode.cc b/source/blender/compositor/nodes/COM_ColorMatteNode.cc index eadb8ce4f96..345cdb3ecf7 100644 --- a/source/blender/compositor/nodes/COM_ColorMatteNode.cc +++ b/source/blender/compositor/nodes/COM_ColorMatteNode.cc @@ -17,7 +17,6 @@ */ #include "COM_ColorMatteNode.h" -#include "BKE_node.h" #include "COM_ColorMatteOperation.h" #include "COM_ConvertOperation.h" #include "COM_SetAlphaMultiplyOperation.h" diff --git a/source/blender/compositor/nodes/COM_ColorNode.cc b/source/blender/compositor/nodes/COM_ColorNode.cc index f8277645a4b..e79f2eb97af 100644 --- a/source/blender/compositor/nodes/COM_ColorNode.cc +++ b/source/blender/compositor/nodes/COM_ColorNode.cc @@ -17,7 +17,6 @@ */ #include "COM_ColorNode.h" -#include "COM_ExecutionSystem.h" #include "COM_SetColorOperation.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_ColorRampNode.cc b/source/blender/compositor/nodes/COM_ColorRampNode.cc index 6b44ef3057e..e4346459dd4 100644 --- a/source/blender/compositor/nodes/COM_ColorRampNode.cc +++ b/source/blender/compositor/nodes/COM_ColorRampNode.cc @@ -17,11 +17,8 @@ */ #include "COM_ColorRampNode.h" -#include "BKE_node.h" #include "COM_ColorRampOperation.h" #include "COM_ConvertOperation.h" -#include "COM_ExecutionSystem.h" -#include "DNA_texture_types.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_ColorSpillNode.cc b/source/blender/compositor/nodes/COM_ColorSpillNode.cc index 6119e635e59..d0bd4eb12ea 100644 --- a/source/blender/compositor/nodes/COM_ColorSpillNode.cc +++ b/source/blender/compositor/nodes/COM_ColorSpillNode.cc @@ -17,7 +17,6 @@ */ #include "COM_ColorSpillNode.h" -#include "BKE_node.h" #include "COM_ColorSpillOperation.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_ColorToBWNode.cc b/source/blender/compositor/nodes/COM_ColorToBWNode.cc index dcedfc19e4d..ac051ab0d55 100644 --- a/source/blender/compositor/nodes/COM_ColorToBWNode.cc +++ b/source/blender/compositor/nodes/COM_ColorToBWNode.cc @@ -19,7 +19,6 @@ #include "COM_ColorToBWNode.h" #include "COM_ConvertOperation.h" -#include "COM_ExecutionSystem.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_CompositorNode.cc b/source/blender/compositor/nodes/COM_CompositorNode.cc index 262fa550915..10c87b8c886 100644 --- a/source/blender/compositor/nodes/COM_CompositorNode.cc +++ b/source/blender/compositor/nodes/COM_CompositorNode.cc @@ -18,7 +18,6 @@ #include "COM_CompositorNode.h" #include "COM_CompositorOperation.h" -#include "COM_ExecutionSystem.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_ConvertAlphaNode.cc b/source/blender/compositor/nodes/COM_ConvertAlphaNode.cc index ac4e45357dc..649d851fe84 100644 --- a/source/blender/compositor/nodes/COM_ConvertAlphaNode.cc +++ b/source/blender/compositor/nodes/COM_ConvertAlphaNode.cc @@ -18,7 +18,6 @@ #include "COM_ConvertAlphaNode.h" #include "COM_ConvertOperation.h" -#include "COM_ExecutionSystem.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_CornerPinNode.cc b/source/blender/compositor/nodes/COM_CornerPinNode.cc index 3cfa20f4e05..fb188dc45f8 100644 --- a/source/blender/compositor/nodes/COM_CornerPinNode.cc +++ b/source/blender/compositor/nodes/COM_CornerPinNode.cc @@ -16,7 +16,6 @@ */ #include "COM_CornerPinNode.h" -#include "COM_ExecutionSystem.h" #include "COM_PlaneCornerPinOperation.h" diff --git a/source/blender/compositor/nodes/COM_CryptomatteNode.cc b/source/blender/compositor/nodes/COM_CryptomatteNode.cc index c04d98d6a2b..21596d5aebb 100644 --- a/source/blender/compositor/nodes/COM_CryptomatteNode.cc +++ b/source/blender/compositor/nodes/COM_CryptomatteNode.cc @@ -18,18 +18,11 @@ #include "COM_CryptomatteNode.h" #include "BKE_node.h" -#include "BLI_assert.h" -#include "BLI_hash_mm3.h" -#include "BLI_listbase.h" -#include "BLI_string.h" #include "COM_ConvertOperation.h" -#include "COM_CryptomatteOperation.h" #include "COM_MultilayerImageOperation.h" #include "COM_RenderLayersProg.h" #include "COM_SetAlphaMultiplyOperation.h" #include "COM_SetColorOperation.h" -#include <iterator> -#include <string> namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_DefocusNode.cc b/source/blender/compositor/nodes/COM_DefocusNode.cc index 2023e4f7118..6f1361df284 100644 --- a/source/blender/compositor/nodes/COM_DefocusNode.cc +++ b/source/blender/compositor/nodes/COM_DefocusNode.cc @@ -19,16 +19,10 @@ #include "COM_DefocusNode.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_VariableSizeBokehBlurOperation.h" -#include "DNA_camera_types.h" -#include "DNA_node_types.h" -#include "DNA_object_types.h" -#include "DNA_scene_types.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_DenoiseNode.cc b/source/blender/compositor/nodes/COM_DenoiseNode.cc index cc9328414ef..e576966626c 100644 --- a/source/blender/compositor/nodes/COM_DenoiseNode.cc +++ b/source/blender/compositor/nodes/COM_DenoiseNode.cc @@ -17,9 +17,6 @@ */ #include "COM_DenoiseNode.h" #include "COM_DenoiseOperation.h" -#include "COM_MixOperation.h" -#include "COM_SetValueOperation.h" -#include "DNA_node_types.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_DespeckleNode.cc b/source/blender/compositor/nodes/COM_DespeckleNode.cc index beda479025d..1a068112210 100644 --- a/source/blender/compositor/nodes/COM_DespeckleNode.cc +++ b/source/blender/compositor/nodes/COM_DespeckleNode.cc @@ -17,10 +17,7 @@ */ #include "COM_DespeckleNode.h" -#include "BLI_math.h" #include "COM_DespeckleOperation.h" -#include "COM_ExecutionSystem.h" -#include "DNA_scene_types.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_DifferenceMatteNode.cc b/source/blender/compositor/nodes/COM_DifferenceMatteNode.cc index 8c989bfc04e..9700b761eca 100644 --- a/source/blender/compositor/nodes/COM_DifferenceMatteNode.cc +++ b/source/blender/compositor/nodes/COM_DifferenceMatteNode.cc @@ -17,7 +17,6 @@ */ #include "COM_DifferenceMatteNode.h" -#include "BKE_node.h" #include "COM_DifferenceMatteOperation.h" #include "COM_SetAlphaMultiplyOperation.h" diff --git a/source/blender/compositor/nodes/COM_DilateErodeNode.cc b/source/blender/compositor/nodes/COM_DilateErodeNode.cc index 1867014f64b..dbd03b02b8e 100644 --- a/source/blender/compositor/nodes/COM_DilateErodeNode.cc +++ b/source/blender/compositor/nodes/COM_DilateErodeNode.cc @@ -17,10 +17,8 @@ */ #include "COM_DilateErodeNode.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" diff --git a/source/blender/compositor/nodes/COM_DirectionalBlurNode.cc b/source/blender/compositor/nodes/COM_DirectionalBlurNode.cc index 90c4236bce8..dce2a1a7911 100644 --- a/source/blender/compositor/nodes/COM_DirectionalBlurNode.cc +++ b/source/blender/compositor/nodes/COM_DirectionalBlurNode.cc @@ -18,8 +18,6 @@ #include "COM_DirectionalBlurNode.h" #include "COM_DirectionalBlurOperation.h" -#include "COM_ExecutionSystem.h" -#include "DNA_node_types.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_DisplaceNode.cc b/source/blender/compositor/nodes/COM_DisplaceNode.cc index f2ec750c595..d13c0c347fb 100644 --- a/source/blender/compositor/nodes/COM_DisplaceNode.cc +++ b/source/blender/compositor/nodes/COM_DisplaceNode.cc @@ -19,7 +19,6 @@ #include "COM_DisplaceNode.h" #include "COM_DisplaceOperation.h" #include "COM_DisplaceSimpleOperation.h" -#include "COM_ExecutionSystem.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_DistanceMatteNode.cc b/source/blender/compositor/nodes/COM_DistanceMatteNode.cc index 4450c4a2f4a..26886a6580f 100644 --- a/source/blender/compositor/nodes/COM_DistanceMatteNode.cc +++ b/source/blender/compositor/nodes/COM_DistanceMatteNode.cc @@ -17,9 +17,7 @@ */ #include "COM_DistanceMatteNode.h" -#include "BKE_node.h" #include "COM_ConvertOperation.h" -#include "COM_DistanceRGBMatteOperation.h" #include "COM_DistanceYCCMatteOperation.h" #include "COM_SetAlphaMultiplyOperation.h" diff --git a/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cc b/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cc index 847dcc2f8f1..273f0ee7026 100644 --- a/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cc +++ b/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cc @@ -18,7 +18,6 @@ #include "COM_DoubleEdgeMaskNode.h" #include "COM_DoubleEdgeMaskOperation.h" -#include "COM_ExecutionSystem.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_EllipseMaskNode.cc b/source/blender/compositor/nodes/COM_EllipseMaskNode.cc index 752597ef937..4f3703dceb1 100644 --- a/source/blender/compositor/nodes/COM_EllipseMaskNode.cc +++ b/source/blender/compositor/nodes/COM_EllipseMaskNode.cc @@ -18,7 +18,6 @@ #include "COM_EllipseMaskNode.h" #include "COM_EllipseMaskOperation.h" -#include "COM_ExecutionSystem.h" #include "COM_ScaleOperation.h" #include "COM_SetValueOperation.h" diff --git a/source/blender/compositor/nodes/COM_FilterNode.cc b/source/blender/compositor/nodes/COM_FilterNode.cc index 351219155c2..4cdb00a87f4 100644 --- a/source/blender/compositor/nodes/COM_FilterNode.cc +++ b/source/blender/compositor/nodes/COM_FilterNode.cc @@ -19,9 +19,6 @@ #include "COM_FilterNode.h" #include "BKE_node.h" #include "COM_ConvolutionEdgeFilterOperation.h" -#include "COM_ConvolutionFilterOperation.h" -#include "COM_ExecutionSystem.h" -#include "COM_MixOperation.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_FlipNode.cc b/source/blender/compositor/nodes/COM_FlipNode.cc index bca6cd3c4f7..1c613bde674 100644 --- a/source/blender/compositor/nodes/COM_FlipNode.cc +++ b/source/blender/compositor/nodes/COM_FlipNode.cc @@ -18,7 +18,6 @@ #include "COM_FlipNode.h" -#include "COM_ExecutionSystem.h" #include "COM_FlipOperation.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_GammaNode.cc b/source/blender/compositor/nodes/COM_GammaNode.cc index 52148a80a8f..31253a90462 100644 --- a/source/blender/compositor/nodes/COM_GammaNode.cc +++ b/source/blender/compositor/nodes/COM_GammaNode.cc @@ -17,7 +17,6 @@ */ #include "COM_GammaNode.h" -#include "COM_ExecutionSystem.h" #include "COM_GammaOperation.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_GlareNode.cc b/source/blender/compositor/nodes/COM_GlareNode.cc index 9c26d7c86a9..bbbbb7fa7ee 100644 --- a/source/blender/compositor/nodes/COM_GlareNode.cc +++ b/source/blender/compositor/nodes/COM_GlareNode.cc @@ -17,7 +17,6 @@ */ #include "COM_GlareNode.h" -#include "COM_FastGaussianBlurOperation.h" #include "COM_GlareFogGlowOperation.h" #include "COM_GlareGhostOperation.h" #include "COM_GlareSimpleStarOperation.h" @@ -25,7 +24,6 @@ #include "COM_GlareThresholdOperation.h" #include "COM_MixOperation.h" #include "COM_SetValueOperation.h" -#include "DNA_node_types.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cc b/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cc index e7b1664c354..3cf4b218bb2 100644 --- a/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cc +++ b/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cc @@ -19,12 +19,8 @@ #include "COM_HueSaturationValueCorrectNode.h" #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" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_HueSaturationValueNode.cc b/source/blender/compositor/nodes/COM_HueSaturationValueNode.cc index 29e5f39a144..7711c306f24 100644 --- a/source/blender/compositor/nodes/COM_HueSaturationValueNode.cc +++ b/source/blender/compositor/nodes/COM_HueSaturationValueNode.cc @@ -20,11 +20,7 @@ #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 "DNA_node_types.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_IDMaskNode.cc b/source/blender/compositor/nodes/COM_IDMaskNode.cc index 761cb8b98cf..0a7ed521afb 100644 --- a/source/blender/compositor/nodes/COM_IDMaskNode.cc +++ b/source/blender/compositor/nodes/COM_IDMaskNode.cc @@ -17,7 +17,6 @@ */ #include "COM_IDMaskNode.h" -#include "COM_ExecutionSystem.h" #include "COM_IDMaskOperation.h" #include "COM_SMAAOperation.h" diff --git a/source/blender/compositor/nodes/COM_ImageNode.cc b/source/blender/compositor/nodes/COM_ImageNode.cc index 20476144efa..992d5697109 100644 --- a/source/blender/compositor/nodes/COM_ImageNode.cc +++ b/source/blender/compositor/nodes/COM_ImageNode.cc @@ -17,14 +17,9 @@ */ #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_SeparateColorNode.h" #include "COM_SetColorOperation.h" #include "COM_SetValueOperation.h" #include "COM_SetVectorOperation.h" diff --git a/source/blender/compositor/nodes/COM_InpaintNode.cc b/source/blender/compositor/nodes/COM_InpaintNode.cc index 01ec5523939..93fb051090c 100644 --- a/source/blender/compositor/nodes/COM_InpaintNode.cc +++ b/source/blender/compositor/nodes/COM_InpaintNode.cc @@ -17,10 +17,7 @@ */ #include "COM_InpaintNode.h" -#include "BLI_math.h" -#include "COM_ExecutionSystem.h" #include "COM_InpaintOperation.h" -#include "DNA_scene_types.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_InvertNode.cc b/source/blender/compositor/nodes/COM_InvertNode.cc index 5fe2033227f..cb15f3b28b0 100644 --- a/source/blender/compositor/nodes/COM_InvertNode.cc +++ b/source/blender/compositor/nodes/COM_InvertNode.cc @@ -18,7 +18,6 @@ #include "COM_InvertNode.h" #include "BKE_node.h" -#include "COM_ExecutionSystem.h" #include "COM_InvertOperation.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_KeyingNode.cc b/source/blender/compositor/nodes/COM_KeyingNode.cc index 0af328a3601..c928b55fbb0 100644 --- a/source/blender/compositor/nodes/COM_KeyingNode.cc +++ b/source/blender/compositor/nodes/COM_KeyingNode.cc @@ -18,8 +18,6 @@ #include "COM_KeyingNode.h" -#include "COM_ExecutionSystem.h" - #include "COM_KeyingBlurOperation.h" #include "COM_KeyingClipOperation.h" #include "COM_KeyingDespillOperation.h" diff --git a/source/blender/compositor/nodes/COM_KeyingScreenNode.cc b/source/blender/compositor/nodes/COM_KeyingScreenNode.cc index 43574d02d80..e405c01ddf2 100644 --- a/source/blender/compositor/nodes/COM_KeyingScreenNode.cc +++ b/source/blender/compositor/nodes/COM_KeyingScreenNode.cc @@ -17,11 +17,8 @@ */ #include "COM_KeyingScreenNode.h" -#include "COM_ExecutionSystem.h" #include "COM_KeyingScreenOperation.h" -#include "DNA_movieclip_types.h" - namespace blender::compositor { KeyingScreenNode::KeyingScreenNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_LensDistortionNode.cc b/source/blender/compositor/nodes/COM_LensDistortionNode.cc index f5226d31989..46223c1f294 100644 --- a/source/blender/compositor/nodes/COM_LensDistortionNode.cc +++ b/source/blender/compositor/nodes/COM_LensDistortionNode.cc @@ -17,7 +17,6 @@ */ #include "COM_LensDistortionNode.h" -#include "COM_ExecutionSystem.h" #include "COM_ProjectorLensDistortionOperation.h" #include "COM_ScreenLensDistortionOperation.h" diff --git a/source/blender/compositor/nodes/COM_LuminanceMatteNode.cc b/source/blender/compositor/nodes/COM_LuminanceMatteNode.cc index 920da53231f..e38aff91431 100644 --- a/source/blender/compositor/nodes/COM_LuminanceMatteNode.cc +++ b/source/blender/compositor/nodes/COM_LuminanceMatteNode.cc @@ -17,8 +17,6 @@ */ #include "COM_LuminanceMatteNode.h" -#include "BKE_node.h" -#include "COM_ConvertOperation.h" #include "COM_LuminanceMatteOperation.h" #include "COM_SetAlphaMultiplyOperation.h" diff --git a/source/blender/compositor/nodes/COM_MapRangeNode.cc b/source/blender/compositor/nodes/COM_MapRangeNode.cc index 718a6d9e47b..01288b779ec 100644 --- a/source/blender/compositor/nodes/COM_MapRangeNode.cc +++ b/source/blender/compositor/nodes/COM_MapRangeNode.cc @@ -18,7 +18,6 @@ #include "COM_MapRangeNode.h" -#include "COM_ExecutionSystem.h" #include "COM_MapRangeOperation.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_MapUVNode.cc b/source/blender/compositor/nodes/COM_MapUVNode.cc index bbf9e8f3aeb..ddda1e2db1d 100644 --- a/source/blender/compositor/nodes/COM_MapUVNode.cc +++ b/source/blender/compositor/nodes/COM_MapUVNode.cc @@ -17,7 +17,6 @@ */ #include "COM_MapUVNode.h" -#include "COM_ExecutionSystem.h" #include "COM_MapUVOperation.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_MapValueNode.cc b/source/blender/compositor/nodes/COM_MapValueNode.cc index ae48bda6cb8..9c6be55e93b 100644 --- a/source/blender/compositor/nodes/COM_MapValueNode.cc +++ b/source/blender/compositor/nodes/COM_MapValueNode.cc @@ -18,7 +18,6 @@ #include "COM_MapValueNode.h" -#include "COM_ExecutionSystem.h" #include "COM_MapValueOperation.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_MaskNode.cc b/source/blender/compositor/nodes/COM_MaskNode.cc index b5b23798160..27488c8a6c8 100644 --- a/source/blender/compositor/nodes/COM_MaskNode.cc +++ b/source/blender/compositor/nodes/COM_MaskNode.cc @@ -17,11 +17,8 @@ */ #include "COM_MaskNode.h" -#include "COM_ExecutionSystem.h" #include "COM_MaskOperation.h" -#include "DNA_mask_types.h" - namespace blender::compositor { MaskNode::MaskNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_MathNode.cc b/source/blender/compositor/nodes/COM_MathNode.cc index dd0d8931d58..f8a1530fe29 100644 --- a/source/blender/compositor/nodes/COM_MathNode.cc +++ b/source/blender/compositor/nodes/COM_MathNode.cc @@ -17,7 +17,6 @@ */ #include "COM_MathNode.h" -#include "COM_ExecutionSystem.h" #include "COM_MathBaseOperation.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_MixNode.cc b/source/blender/compositor/nodes/COM_MixNode.cc index cfa8d0ee6a6..9eb38783d6a 100644 --- a/source/blender/compositor/nodes/COM_MixNode.cc +++ b/source/blender/compositor/nodes/COM_MixNode.cc @@ -20,8 +20,6 @@ #include "COM_MixOperation.h" -#include "COM_ExecutionSystem.h" -#include "COM_SetValueOperation.h" #include "DNA_material_types.h" /* the ramp types */ namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_MovieClipNode.cc b/source/blender/compositor/nodes/COM_MovieClipNode.cc index b80071d27c7..9c2e3c95a03 100644 --- a/source/blender/compositor/nodes/COM_MovieClipNode.cc +++ b/source/blender/compositor/nodes/COM_MovieClipNode.cc @@ -17,10 +17,8 @@ */ #include "COM_MovieClipNode.h" -#include "COM_ConvertColorProfileOperation.h" -#include "COM_ExecutionSystem.h" + #include "COM_MovieClipOperation.h" -#include "COM_SetValueOperation.h" #include "BKE_movieclip.h" #include "BKE_tracking.h" diff --git a/source/blender/compositor/nodes/COM_MovieDistortionNode.cc b/source/blender/compositor/nodes/COM_MovieDistortionNode.cc index 8f17ef8bb98..c9155ee8ca3 100644 --- a/source/blender/compositor/nodes/COM_MovieDistortionNode.cc +++ b/source/blender/compositor/nodes/COM_MovieDistortionNode.cc @@ -18,9 +18,7 @@ #include "COM_MovieDistortionNode.h" -#include "COM_ExecutionSystem.h" #include "COM_MovieDistortionOperation.h" -#include "DNA_movieclip_types.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_NormalNode.cc b/source/blender/compositor/nodes/COM_NormalNode.cc index 5a97b0932ef..5a05f4c89b5 100644 --- a/source/blender/compositor/nodes/COM_NormalNode.cc +++ b/source/blender/compositor/nodes/COM_NormalNode.cc @@ -17,9 +17,7 @@ */ #include "COM_NormalNode.h" -#include "BKE_node.h" #include "COM_DotproductOperation.h" -#include "COM_ExecutionSystem.h" #include "COM_SetVectorOperation.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_NormalizeNode.cc b/source/blender/compositor/nodes/COM_NormalizeNode.cc index 639dd8e5a51..b42f8154ce0 100644 --- a/source/blender/compositor/nodes/COM_NormalizeNode.cc +++ b/source/blender/compositor/nodes/COM_NormalizeNode.cc @@ -17,7 +17,6 @@ */ #include "COM_NormalizeNode.h" -#include "COM_ExecutionSystem.h" #include "COM_NormalizeOperation.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_OutputFileNode.cc b/source/blender/compositor/nodes/COM_OutputFileNode.cc index 25ec7331849..772456da963 100644 --- a/source/blender/compositor/nodes/COM_OutputFileNode.cc +++ b/source/blender/compositor/nodes/COM_OutputFileNode.cc @@ -17,12 +17,6 @@ */ #include "COM_OutputFileNode.h" -#include "COM_ExecutionSystem.h" -#include "COM_OutputFileOperation.h" - -#include "BKE_scene.h" - -#include "BLI_path_util.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_PixelateNode.cc b/source/blender/compositor/nodes/COM_PixelateNode.cc index 396f339e5a2..ae7169b2d98 100644 --- a/source/blender/compositor/nodes/COM_PixelateNode.cc +++ b/source/blender/compositor/nodes/COM_PixelateNode.cc @@ -18,7 +18,6 @@ #include "COM_PixelateNode.h" -#include "COM_ExecutionSystem.h" #include "COM_PixelateOperation.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cc b/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cc index 54a0f4d0452..716392f8bcf 100644 --- a/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cc +++ b/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cc @@ -17,14 +17,9 @@ */ #include "COM_PlaneTrackDeformNode.h" -#include "COM_ExecutionSystem.h" #include "COM_PlaneTrackOperation.h" -#include "BKE_movieclip.h" -#include "BKE_node.h" -#include "BKE_tracking.h" - namespace blender::compositor { PlaneTrackDeformNode::PlaneTrackDeformNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_PosterizeNode.cc b/source/blender/compositor/nodes/COM_PosterizeNode.cc index 9f5a69961a4..a69e4f17250 100644 --- a/source/blender/compositor/nodes/COM_PosterizeNode.cc +++ b/source/blender/compositor/nodes/COM_PosterizeNode.cc @@ -17,7 +17,6 @@ */ #include "COM_PosterizeNode.h" -#include "COM_ExecutionSystem.h" #include "COM_PosterizeOperation.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_RenderLayersNode.cc b/source/blender/compositor/nodes/COM_RenderLayersNode.cc index 6744e98ecdb..87dccec7bfc 100644 --- a/source/blender/compositor/nodes/COM_RenderLayersNode.cc +++ b/source/blender/compositor/nodes/COM_RenderLayersNode.cc @@ -17,13 +17,9 @@ */ #include "COM_RenderLayersNode.h" -#include "COM_RenderLayersProg.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" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_RotateNode.cc b/source/blender/compositor/nodes/COM_RotateNode.cc index c2fd8ed5594..76c11a79d2f 100644 --- a/source/blender/compositor/nodes/COM_RotateNode.cc +++ b/source/blender/compositor/nodes/COM_RotateNode.cc @@ -18,7 +18,6 @@ #include "COM_RotateNode.h" -#include "COM_ExecutionSystem.h" #include "COM_RotateOperation.h" #include "COM_SetSamplerOperation.h" diff --git a/source/blender/compositor/nodes/COM_ScaleNode.cc b/source/blender/compositor/nodes/COM_ScaleNode.cc index f1f41375eba..1e33a8688a9 100644 --- a/source/blender/compositor/nodes/COM_ScaleNode.cc +++ b/source/blender/compositor/nodes/COM_ScaleNode.cc @@ -19,9 +19,7 @@ #include "COM_ScaleNode.h" #include "BKE_node.h" -#include "COM_ExecutionSystem.h" #include "COM_ScaleOperation.h" -#include "COM_SetSamplerOperation.h" #include "COM_SetValueOperation.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_SetAlphaNode.cc b/source/blender/compositor/nodes/COM_SetAlphaNode.cc index c7365b09f71..a3a8472ccc9 100644 --- a/source/blender/compositor/nodes/COM_SetAlphaNode.cc +++ b/source/blender/compositor/nodes/COM_SetAlphaNode.cc @@ -17,7 +17,6 @@ */ #include "COM_SetAlphaNode.h" -#include "COM_ExecutionSystem.h" #include "COM_SetAlphaMultiplyOperation.h" #include "COM_SetAlphaReplaceOperation.h" diff --git a/source/blender/compositor/nodes/COM_SocketProxyNode.cc b/source/blender/compositor/nodes/COM_SocketProxyNode.cc index b3aa1770551..4bd3eb0b058 100644 --- a/source/blender/compositor/nodes/COM_SocketProxyNode.cc +++ b/source/blender/compositor/nodes/COM_SocketProxyNode.cc @@ -17,12 +17,7 @@ */ #include "COM_SocketProxyNode.h" -#include "COM_ExecutionSystem.h" #include "COM_ReadBufferOperation.h" -#include "COM_SetColorOperation.h" -#include "COM_SetValueOperation.h" -#include "COM_SetVectorOperation.h" -#include "COM_SocketProxyOperation.h" #include "COM_WriteBufferOperation.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_SplitViewerNode.cc b/source/blender/compositor/nodes/COM_SplitViewerNode.cc index 582c650f205..bdc927c59a5 100644 --- a/source/blender/compositor/nodes/COM_SplitViewerNode.cc +++ b/source/blender/compositor/nodes/COM_SplitViewerNode.cc @@ -17,11 +17,7 @@ */ #include "COM_SplitViewerNode.h" -#include "BKE_global.h" -#include "BKE_image.h" -#include "BKE_scene.h" -#include "COM_ExecutionSystem.h" #include "COM_SplitOperation.h" #include "COM_ViewerOperation.h" diff --git a/source/blender/compositor/nodes/COM_Stabilize2dNode.cc b/source/blender/compositor/nodes/COM_Stabilize2dNode.cc index 3d8f0bbda7e..48eeb337842 100644 --- a/source/blender/compositor/nodes/COM_Stabilize2dNode.cc +++ b/source/blender/compositor/nodes/COM_Stabilize2dNode.cc @@ -17,18 +17,12 @@ */ #include "COM_Stabilize2dNode.h" -#include "COM_ExecutionSystem.h" #include "COM_MovieClipAttributeOperation.h" #include "COM_RotateOperation.h" #include "COM_ScaleOperation.h" #include "COM_SetSamplerOperation.h" -#include "COM_TransformOperation.h" #include "COM_TranslateOperation.h" -#include "BKE_tracking.h" - -#include "DNA_movieclip_types.h" - namespace blender::compositor { Stabilize2dNode::Stabilize2dNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_SwitchViewNode.cc b/source/blender/compositor/nodes/COM_SwitchViewNode.cc index 395122dd11b..5bf854bb0a0 100644 --- a/source/blender/compositor/nodes/COM_SwitchViewNode.cc +++ b/source/blender/compositor/nodes/COM_SwitchViewNode.cc @@ -17,7 +17,6 @@ */ #include "COM_SwitchViewNode.h" -#include "BLI_listbase.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_TextureNode.cc b/source/blender/compositor/nodes/COM_TextureNode.cc index 317355b8c9a..4063e4b4bce 100644 --- a/source/blender/compositor/nodes/COM_TextureNode.cc +++ b/source/blender/compositor/nodes/COM_TextureNode.cc @@ -17,7 +17,6 @@ */ #include "COM_TextureNode.h" -#include "COM_ExecutionSystem.h" #include "COM_TextureOperation.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_TimeNode.cc b/source/blender/compositor/nodes/COM_TimeNode.cc index c14c5344eee..37236959366 100644 --- a/source/blender/compositor/nodes/COM_TimeNode.cc +++ b/source/blender/compositor/nodes/COM_TimeNode.cc @@ -17,13 +17,11 @@ */ #include "COM_TimeNode.h" -#include "COM_ExecutionSystem.h" + #include "COM_SetValueOperation.h" #include "BKE_colortools.h" -#include "BLI_utildefines.h" - namespace blender::compositor { TimeNode::TimeNode(bNode *editorNode) : Node(editorNode) diff --git a/source/blender/compositor/nodes/COM_TonemapNode.cc b/source/blender/compositor/nodes/COM_TonemapNode.cc index 844fe3e8cb6..a2b3e84b604 100644 --- a/source/blender/compositor/nodes/COM_TonemapNode.cc +++ b/source/blender/compositor/nodes/COM_TonemapNode.cc @@ -17,7 +17,6 @@ */ #include "COM_TonemapNode.h" -#include "COM_ExecutionSystem.h" #include "COM_TonemapOperation.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_TrackPositionNode.cc b/source/blender/compositor/nodes/COM_TrackPositionNode.cc index 3fb5fc02f20..f683eeb61c2 100644 --- a/source/blender/compositor/nodes/COM_TrackPositionNode.cc +++ b/source/blender/compositor/nodes/COM_TrackPositionNode.cc @@ -19,7 +19,6 @@ #include "COM_TrackPositionNode.h" #include "COM_ConvertOperation.h" -#include "COM_ExecutionSystem.h" #include "COM_TrackPositionOperation.h" #include "DNA_movieclip_types.h" diff --git a/source/blender/compositor/nodes/COM_TransformNode.cc b/source/blender/compositor/nodes/COM_TransformNode.cc index b38aad78d90..a5b3c41de80 100644 --- a/source/blender/compositor/nodes/COM_TransformNode.cc +++ b/source/blender/compositor/nodes/COM_TransformNode.cc @@ -17,12 +17,9 @@ */ #include "COM_TransformNode.h" -#include "COM_ExecutionSystem.h" #include "COM_RotateOperation.h" #include "COM_ScaleOperation.h" #include "COM_SetSamplerOperation.h" -#include "COM_SetValueOperation.h" -#include "COM_TransformOperation.h" #include "COM_TranslateOperation.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_TranslateNode.cc b/source/blender/compositor/nodes/COM_TranslateNode.cc index 165a03baf41..6dbd350fabf 100644 --- a/source/blender/compositor/nodes/COM_TranslateNode.cc +++ b/source/blender/compositor/nodes/COM_TranslateNode.cc @@ -18,7 +18,6 @@ #include "COM_TranslateNode.h" -#include "COM_ExecutionSystem.h" #include "COM_TranslateOperation.h" #include "COM_WrapOperation.h" #include "COM_WriteBufferOperation.h" diff --git a/source/blender/compositor/nodes/COM_ValueNode.cc b/source/blender/compositor/nodes/COM_ValueNode.cc index 6b640fa2a3a..611353fceba 100644 --- a/source/blender/compositor/nodes/COM_ValueNode.cc +++ b/source/blender/compositor/nodes/COM_ValueNode.cc @@ -17,7 +17,6 @@ */ #include "COM_ValueNode.h" -#include "COM_ExecutionSystem.h" #include "COM_SetValueOperation.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_VectorBlurNode.cc b/source/blender/compositor/nodes/COM_VectorBlurNode.cc index 7aa5f5668c9..2bbfd3591c3 100644 --- a/source/blender/compositor/nodes/COM_VectorBlurNode.cc +++ b/source/blender/compositor/nodes/COM_VectorBlurNode.cc @@ -18,7 +18,6 @@ #include "COM_VectorBlurNode.h" #include "COM_VectorBlurOperation.h" -#include "DNA_node_types.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_VectorCurveNode.cc b/source/blender/compositor/nodes/COM_VectorCurveNode.cc index f2fd80cd93e..2b26056296d 100644 --- a/source/blender/compositor/nodes/COM_VectorCurveNode.cc +++ b/source/blender/compositor/nodes/COM_VectorCurveNode.cc @@ -17,7 +17,6 @@ */ #include "COM_VectorCurveNode.h" -#include "COM_ExecutionSystem.h" #include "COM_VectorCurveOperation.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_ViewLevelsNode.cc b/source/blender/compositor/nodes/COM_ViewLevelsNode.cc index 5a03972c89d..605ff9357ab 100644 --- a/source/blender/compositor/nodes/COM_ViewLevelsNode.cc +++ b/source/blender/compositor/nodes/COM_ViewLevelsNode.cc @@ -17,10 +17,7 @@ */ #include "COM_ViewLevelsNode.h" -#include "COM_CalculateMeanOperation.h" #include "COM_CalculateStandardDeviationOperation.h" -#include "COM_ExecutionSystem.h" -#include "COM_SetValueOperation.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_ViewerNode.cc b/source/blender/compositor/nodes/COM_ViewerNode.cc index 4dbcdbe9e40..38ea37a28d6 100644 --- a/source/blender/compositor/nodes/COM_ViewerNode.cc +++ b/source/blender/compositor/nodes/COM_ViewerNode.cc @@ -17,12 +17,7 @@ */ #include "COM_ViewerNode.h" -#include "BKE_global.h" -#include "BKE_image.h" -#include "BKE_scene.h" -#include "BLI_listbase.h" -#include "COM_ExecutionSystem.h" #include "COM_ViewerOperation.h" namespace blender::compositor { diff --git a/source/blender/compositor/nodes/COM_ZCombineNode.cc b/source/blender/compositor/nodes/COM_ZCombineNode.cc index 9753e812a8b..5f7fec53808 100644 --- a/source/blender/compositor/nodes/COM_ZCombineNode.cc +++ b/source/blender/compositor/nodes/COM_ZCombineNode.cc @@ -18,15 +18,9 @@ #include "COM_ZCombineNode.h" -#include "COM_ZCombineOperation.h" - #include "COM_AntiAliasOperation.h" -#include "COM_ExecutionSystem.h" #include "COM_MathBaseOperation.h" -#include "COM_MixOperation.h" -#include "COM_SetValueOperation.h" - -#include "DNA_material_types.h" /* the ramp types */ +#include "COM_ZCombineOperation.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_AntiAliasOperation.cc b/source/blender/compositor/operations/COM_AntiAliasOperation.cc index deccbb28f49..dd73f9a7a77 100644 --- a/source/blender/compositor/operations/COM_AntiAliasOperation.cc +++ b/source/blender/compositor/operations/COM_AntiAliasOperation.cc @@ -17,12 +17,6 @@ */ #include "COM_AntiAliasOperation.h" -#include "BLI_math.h" -#include "BLI_utildefines.h" - -#include "MEM_guardedalloc.h" - -#include "RE_texture.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_BilateralBlurOperation.cc b/source/blender/compositor/operations/COM_BilateralBlurOperation.cc index 44680c3acd1..de70feed907 100644 --- a/source/blender/compositor/operations/COM_BilateralBlurOperation.cc +++ b/source/blender/compositor/operations/COM_BilateralBlurOperation.cc @@ -17,9 +17,6 @@ */ #include "COM_BilateralBlurOperation.h" -#include "BLI_math.h" - -#include "RE_pipeline.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_BlurBaseOperation.cc b/source/blender/compositor/operations/COM_BlurBaseOperation.cc index 412632e2e22..f21cb9f4285 100644 --- a/source/blender/compositor/operations/COM_BlurBaseOperation.cc +++ b/source/blender/compositor/operations/COM_BlurBaseOperation.cc @@ -19,9 +19,6 @@ #include "COM_BlurBaseOperation.h" #include "COM_ConstantOperation.h" -#include "BLI_math.h" -#include "MEM_guardedalloc.h" - #include "RE_pipeline.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_BokehBlurOperation.cc b/source/blender/compositor/operations/COM_BokehBlurOperation.cc index 93482dd2a54..c175eff093b 100644 --- a/source/blender/compositor/operations/COM_BokehBlurOperation.cc +++ b/source/blender/compositor/operations/COM_BokehBlurOperation.cc @@ -19,11 +19,8 @@ #include "COM_BokehBlurOperation.h" #include "COM_ConstantOperation.h" -#include "BLI_math.h" #include "COM_OpenCLDevice.h" -#include "RE_pipeline.h" - namespace blender::compositor { constexpr int IMAGE_INPUT_INDEX = 0; diff --git a/source/blender/compositor/operations/COM_BokehImageOperation.cc b/source/blender/compositor/operations/COM_BokehImageOperation.cc index 5c9c8b36ee0..c6e0683b4de 100644 --- a/source/blender/compositor/operations/COM_BokehImageOperation.cc +++ b/source/blender/compositor/operations/COM_BokehImageOperation.cc @@ -17,7 +17,6 @@ */ #include "COM_BokehImageOperation.h" -#include "BLI_math.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_BoxMaskOperation.cc b/source/blender/compositor/operations/COM_BoxMaskOperation.cc index 15bb19660dc..f536d9eb32d 100644 --- a/source/blender/compositor/operations/COM_BoxMaskOperation.cc +++ b/source/blender/compositor/operations/COM_BoxMaskOperation.cc @@ -17,8 +17,6 @@ */ #include "COM_BoxMaskOperation.h" -#include "BLI_math.h" -#include "DNA_node_types.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_CalculateMeanOperation.cc b/source/blender/compositor/operations/COM_CalculateMeanOperation.cc index a573a9d7eed..850b762ede4 100644 --- a/source/blender/compositor/operations/COM_CalculateMeanOperation.cc +++ b/source/blender/compositor/operations/COM_CalculateMeanOperation.cc @@ -17,8 +17,7 @@ */ #include "COM_CalculateMeanOperation.h" -#include "BLI_math.h" -#include "BLI_utildefines.h" + #include "COM_ExecutionSystem.h" #include "IMB_colormanagement.h" diff --git a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cc b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cc index 494b66cb888..6e5ef690b5d 100644 --- a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cc +++ b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cc @@ -17,8 +17,7 @@ */ #include "COM_CalculateStandardDeviationOperation.h" -#include "BLI_math.h" -#include "BLI_utildefines.h" + #include "COM_ExecutionSystem.h" #include "IMB_colormanagement.h" diff --git a/source/blender/compositor/operations/COM_ChannelMatteOperation.cc b/source/blender/compositor/operations/COM_ChannelMatteOperation.cc index 65742d0cfcc..3d79d3d03a0 100644 --- a/source/blender/compositor/operations/COM_ChannelMatteOperation.cc +++ b/source/blender/compositor/operations/COM_ChannelMatteOperation.cc @@ -17,7 +17,6 @@ */ #include "COM_ChannelMatteOperation.h" -#include "BLI_math.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_ChromaMatteOperation.cc b/source/blender/compositor/operations/COM_ChromaMatteOperation.cc index 0784f266b19..207cc641ebd 100644 --- a/source/blender/compositor/operations/COM_ChromaMatteOperation.cc +++ b/source/blender/compositor/operations/COM_ChromaMatteOperation.cc @@ -17,7 +17,6 @@ */ #include "COM_ChromaMatteOperation.h" -#include "BLI_math.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cc b/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cc index 0b6590ae4c7..08df31b81d8 100644 --- a/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cc +++ b/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cc @@ -17,7 +17,6 @@ */ #include "COM_ColorBalanceASCCDLOperation.h" -#include "BLI_math.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cc b/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cc index c658ecd6394..9a482875cdd 100644 --- a/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cc +++ b/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cc @@ -17,7 +17,6 @@ */ #include "COM_ColorBalanceLGGOperation.h" -#include "BLI_math.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_ColorCorrectionOperation.cc b/source/blender/compositor/operations/COM_ColorCorrectionOperation.cc index d3557e541c0..2b2baa15037 100644 --- a/source/blender/compositor/operations/COM_ColorCorrectionOperation.cc +++ b/source/blender/compositor/operations/COM_ColorCorrectionOperation.cc @@ -17,7 +17,6 @@ */ #include "COM_ColorCorrectionOperation.h" -#include "BLI_math.h" #include "IMB_colormanagement.h" diff --git a/source/blender/compositor/operations/COM_ColorCurveOperation.cc b/source/blender/compositor/operations/COM_ColorCurveOperation.cc index 364b310945e..31541786b85 100644 --- a/source/blender/compositor/operations/COM_ColorCurveOperation.cc +++ b/source/blender/compositor/operations/COM_ColorCurveOperation.cc @@ -20,8 +20,6 @@ #include "BKE_colortools.h" -#include "MEM_guardedalloc.h" - namespace blender::compositor { ColorCurveOperation::ColorCurveOperation() diff --git a/source/blender/compositor/operations/COM_ColorCurveOperation.h b/source/blender/compositor/operations/COM_ColorCurveOperation.h index d8271e56d1d..8f6b34c5c6f 100644 --- a/source/blender/compositor/operations/COM_ColorCurveOperation.h +++ b/source/blender/compositor/operations/COM_ColorCurveOperation.h @@ -19,8 +19,6 @@ #pragma once #include "COM_CurveBaseOperation.h" -#include "COM_NodeOperation.h" -#include "DNA_color_types.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_ColorMatteOperation.cc b/source/blender/compositor/operations/COM_ColorMatteOperation.cc index dec6571f217..7dd6a4ab73f 100644 --- a/source/blender/compositor/operations/COM_ColorMatteOperation.cc +++ b/source/blender/compositor/operations/COM_ColorMatteOperation.cc @@ -17,7 +17,6 @@ */ #include "COM_ColorMatteOperation.h" -#include "BLI_math.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_ColorSpillOperation.cc b/source/blender/compositor/operations/COM_ColorSpillOperation.cc index 5bf7a9ee9cd..deed8636360 100644 --- a/source/blender/compositor/operations/COM_ColorSpillOperation.cc +++ b/source/blender/compositor/operations/COM_ColorSpillOperation.cc @@ -17,7 +17,6 @@ */ #include "COM_ColorSpillOperation.h" -#include "BLI_math.h" #define AVG(a, b) ((a + b) / 2) namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_CompositorOperation.cc b/source/blender/compositor/operations/COM_CompositorOperation.cc index f7466b5db34..0713ecd9316 100644 --- a/source/blender/compositor/operations/COM_CompositorOperation.cc +++ b/source/blender/compositor/operations/COM_CompositorOperation.cc @@ -17,19 +17,11 @@ */ #include "COM_CompositorOperation.h" + #include "BKE_global.h" #include "BKE_image.h" -#include "BLI_listbase.h" -#include "MEM_guardedalloc.h" - -#include "BLI_threads.h" #include "RE_pipeline.h" -#include "RE_texture.h" - -#include "render_types.h" - -#include "PIL_time.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_CompositorOperation.h b/source/blender/compositor/operations/COM_CompositorOperation.h index 6eb96e01b47..7b823824cff 100644 --- a/source/blender/compositor/operations/COM_CompositorOperation.h +++ b/source/blender/compositor/operations/COM_CompositorOperation.h @@ -18,8 +18,6 @@ #pragma once -#include "BLI_rect.h" -#include "BLI_string.h" #include "COM_MultiThreadedOperation.h" struct Scene; diff --git a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cc b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cc index 405ba03abf3..18a28f854be 100644 --- a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cc +++ b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cc @@ -18,7 +18,6 @@ #include "COM_ConvertDepthToRadiusOperation.h" #include "BKE_camera.h" -#include "BLI_math.h" #include "DNA_camera_types.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cc b/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cc index 9127a871b04..0f44ccd6fcb 100644 --- a/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cc +++ b/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cc @@ -17,7 +17,6 @@ */ #include "COM_ConvolutionEdgeFilterOperation.h" -#include "BLI_math.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cc b/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cc index 807223fd45f..9d4e8397f54 100644 --- a/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cc +++ b/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cc @@ -18,10 +18,6 @@ #include "COM_ConvolutionFilterOperation.h" -#include "BLI_utildefines.h" - -#include "MEM_guardedalloc.h" - namespace blender::compositor { ConvolutionFilterOperation::ConvolutionFilterOperation() diff --git a/source/blender/compositor/operations/COM_CropOperation.cc b/source/blender/compositor/operations/COM_CropOperation.cc index 6ac30c22ad1..c5a5d1409f4 100644 --- a/source/blender/compositor/operations/COM_CropOperation.cc +++ b/source/blender/compositor/operations/COM_CropOperation.cc @@ -17,7 +17,6 @@ */ #include "COM_CropOperation.h" -#include "BLI_math.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_CurveBaseOperation.h b/source/blender/compositor/operations/COM_CurveBaseOperation.h index da665e7ea60..27d3a68608c 100644 --- a/source/blender/compositor/operations/COM_CurveBaseOperation.h +++ b/source/blender/compositor/operations/COM_CurveBaseOperation.h @@ -19,7 +19,8 @@ #pragma once #include "COM_MultiThreadedOperation.h" -#include "DNA_color_types.h" + +struct CurveMapping; namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_DenoiseOperation.cc b/source/blender/compositor/operations/COM_DenoiseOperation.cc index f8a575acc3a..d8362f4da8d 100644 --- a/source/blender/compositor/operations/COM_DenoiseOperation.cc +++ b/source/blender/compositor/operations/COM_DenoiseOperation.cc @@ -17,14 +17,12 @@ */ #include "COM_DenoiseOperation.h" -#include "BLI_math.h" #include "BLI_system.h" #ifdef WITH_OPENIMAGEDENOISE # include "BLI_threads.h" # include <OpenImageDenoise/oidn.hpp> static pthread_mutex_t oidn_lock = BLI_MUTEX_INITIALIZER; #endif -#include <iostream> namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_DespeckleOperation.cc b/source/blender/compositor/operations/COM_DespeckleOperation.cc index df637ee6709..7c5f33d0f59 100644 --- a/source/blender/compositor/operations/COM_DespeckleOperation.cc +++ b/source/blender/compositor/operations/COM_DespeckleOperation.cc @@ -20,8 +20,6 @@ #include "COM_DespeckleOperation.h" -#include "BLI_utildefines.h" - namespace blender::compositor { DespeckleOperation::DespeckleOperation() diff --git a/source/blender/compositor/operations/COM_DifferenceMatteOperation.cc b/source/blender/compositor/operations/COM_DifferenceMatteOperation.cc index 31714b03b06..eb92f0e9905 100644 --- a/source/blender/compositor/operations/COM_DifferenceMatteOperation.cc +++ b/source/blender/compositor/operations/COM_DifferenceMatteOperation.cc @@ -17,7 +17,6 @@ */ #include "COM_DifferenceMatteOperation.h" -#include "BLI_math.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_DilateErodeOperation.cc b/source/blender/compositor/operations/COM_DilateErodeOperation.cc index b7fd714ba5b..6e4a4d4780e 100644 --- a/source/blender/compositor/operations/COM_DilateErodeOperation.cc +++ b/source/blender/compositor/operations/COM_DilateErodeOperation.cc @@ -17,11 +17,8 @@ */ #include "COM_DilateErodeOperation.h" -#include "BLI_math.h" #include "COM_OpenCLDevice.h" -#include "MEM_guardedalloc.h" - namespace blender::compositor { /* DilateErode Distance Threshold */ diff --git a/source/blender/compositor/operations/COM_DirectionalBlurOperation.cc b/source/blender/compositor/operations/COM_DirectionalBlurOperation.cc index e69124205d0..d1698e989d0 100644 --- a/source/blender/compositor/operations/COM_DirectionalBlurOperation.cc +++ b/source/blender/compositor/operations/COM_DirectionalBlurOperation.cc @@ -19,10 +19,6 @@ #include "COM_DirectionalBlurOperation.h" #include "COM_OpenCLDevice.h" -#include "BLI_math.h" - -#include "RE_pipeline.h" - namespace blender::compositor { DirectionalBlurOperation::DirectionalBlurOperation() diff --git a/source/blender/compositor/operations/COM_DisplaceOperation.cc b/source/blender/compositor/operations/COM_DisplaceOperation.cc index d08ff60d5d0..e6149add5e9 100644 --- a/source/blender/compositor/operations/COM_DisplaceOperation.cc +++ b/source/blender/compositor/operations/COM_DisplaceOperation.cc @@ -17,8 +17,6 @@ */ #include "COM_DisplaceOperation.h" -#include "BLI_math.h" -#include "BLI_utildefines.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cc b/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cc index 712b61be805..81c047ec9f9 100644 --- a/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cc +++ b/source/blender/compositor/operations/COM_DisplaceSimpleOperation.cc @@ -17,8 +17,6 @@ */ #include "COM_DisplaceSimpleOperation.h" -#include "BLI_math.h" -#include "BLI_utildefines.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.cc b/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.cc index 8155ff769a0..ab53bf32bea 100644 --- a/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.cc +++ b/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.cc @@ -17,7 +17,6 @@ */ #include "COM_DistanceRGBMatteOperation.h" -#include "BLI_math.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.cc b/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.cc index 50e473ea5b3..9903b80ce02 100644 --- a/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.cc +++ b/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.cc @@ -17,7 +17,6 @@ */ #include "COM_DistanceYCCMatteOperation.h" -#include "BLI_math.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cc b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cc index d112334b749..fa0201519f8 100644 --- a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cc +++ b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cc @@ -18,10 +18,7 @@ #include <cstdlib> -#include "BLI_math.h" #include "COM_DoubleEdgeMaskOperation.h" -#include "DNA_node_types.h" -#include "MEM_guardedalloc.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_EllipseMaskOperation.cc b/source/blender/compositor/operations/COM_EllipseMaskOperation.cc index bf6eee6d3f9..a32f15a1b8f 100644 --- a/source/blender/compositor/operations/COM_EllipseMaskOperation.cc +++ b/source/blender/compositor/operations/COM_EllipseMaskOperation.cc @@ -17,10 +17,6 @@ */ #include "COM_EllipseMaskOperation.h" -#include "BLI_math.h" -#include "DNA_node_types.h" - -#include <functional> namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cc b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cc index f45b77c6ebc..629a8f1a5cb 100644 --- a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cc +++ b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cc @@ -18,9 +18,7 @@ #include <climits> -#include "BLI_utildefines.h" #include "COM_FastGaussianBlurOperation.h" -#include "MEM_guardedalloc.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_GammaCorrectOperation.cc b/source/blender/compositor/operations/COM_GammaCorrectOperation.cc index 1bff3b965c6..2d97acf4122 100644 --- a/source/blender/compositor/operations/COM_GammaCorrectOperation.cc +++ b/source/blender/compositor/operations/COM_GammaCorrectOperation.cc @@ -17,7 +17,6 @@ */ #include "COM_GammaCorrectOperation.h" -#include "BLI_math.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_GammaOperation.cc b/source/blender/compositor/operations/COM_GammaOperation.cc index 396d3942b06..fab7a8dfb78 100644 --- a/source/blender/compositor/operations/COM_GammaOperation.cc +++ b/source/blender/compositor/operations/COM_GammaOperation.cc @@ -17,7 +17,6 @@ */ #include "COM_GammaOperation.h" -#include "BLI_math.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cc b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cc index 6710ed3cf5b..f53a1da598c 100644 --- a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cc +++ b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cc @@ -17,10 +17,6 @@ */ #include "COM_GaussianAlphaXBlurOperation.h" -#include "BLI_math.h" -#include "MEM_guardedalloc.h" - -#include "RE_pipeline.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cc b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cc index 09aeddb6573..b171ad428b1 100644 --- a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cc +++ b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cc @@ -17,10 +17,6 @@ */ #include "COM_GaussianAlphaYBlurOperation.h" -#include "BLI_math.h" -#include "MEM_guardedalloc.h" - -#include "RE_pipeline.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cc b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cc index aafc269abac..3034d6c590f 100644 --- a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cc +++ b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cc @@ -17,8 +17,6 @@ */ #include "COM_GaussianBokehBlurOperation.h" -#include "BLI_math.h" -#include "MEM_guardedalloc.h" #include "RE_pipeline.h" diff --git a/source/blender/compositor/operations/COM_GaussianXBlurOperation.cc b/source/blender/compositor/operations/COM_GaussianXBlurOperation.cc index 8d686265231..6f1839eee30 100644 --- a/source/blender/compositor/operations/COM_GaussianXBlurOperation.cc +++ b/source/blender/compositor/operations/COM_GaussianXBlurOperation.cc @@ -17,11 +17,7 @@ */ #include "COM_GaussianXBlurOperation.h" -#include "BLI_math.h" #include "COM_OpenCLDevice.h" -#include "MEM_guardedalloc.h" - -#include "RE_pipeline.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_GaussianYBlurOperation.cc b/source/blender/compositor/operations/COM_GaussianYBlurOperation.cc index 32d469a0ae4..cc8c1fce617 100644 --- a/source/blender/compositor/operations/COM_GaussianYBlurOperation.cc +++ b/source/blender/compositor/operations/COM_GaussianYBlurOperation.cc @@ -17,11 +17,7 @@ */ #include "COM_GaussianYBlurOperation.h" -#include "BLI_math.h" #include "COM_OpenCLDevice.h" -#include "MEM_guardedalloc.h" - -#include "RE_pipeline.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_GlareBaseOperation.cc b/source/blender/compositor/operations/COM_GlareBaseOperation.cc index cd4607b1dde..32283a12b27 100644 --- a/source/blender/compositor/operations/COM_GlareBaseOperation.cc +++ b/source/blender/compositor/operations/COM_GlareBaseOperation.cc @@ -17,7 +17,6 @@ */ #include "COM_GlareBaseOperation.h" -#include "BLI_math.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_GlareFogGlowOperation.cc b/source/blender/compositor/operations/COM_GlareFogGlowOperation.cc index 0026615f08b..2142a1b822e 100644 --- a/source/blender/compositor/operations/COM_GlareFogGlowOperation.cc +++ b/source/blender/compositor/operations/COM_GlareFogGlowOperation.cc @@ -17,7 +17,6 @@ */ #include "COM_GlareFogGlowOperation.h" -#include "MEM_guardedalloc.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_GlareGhostOperation.cc b/source/blender/compositor/operations/COM_GlareGhostOperation.cc index 22c8767632e..c5ecfed024c 100644 --- a/source/blender/compositor/operations/COM_GlareGhostOperation.cc +++ b/source/blender/compositor/operations/COM_GlareGhostOperation.cc @@ -17,7 +17,6 @@ */ #include "COM_GlareGhostOperation.h" -#include "BLI_math.h" #include "COM_FastGaussianBlurOperation.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_GlareStreaksOperation.cc b/source/blender/compositor/operations/COM_GlareStreaksOperation.cc index 5ca64b02586..8ffe44d9a36 100644 --- a/source/blender/compositor/operations/COM_GlareStreaksOperation.cc +++ b/source/blender/compositor/operations/COM_GlareStreaksOperation.cc @@ -17,7 +17,6 @@ */ #include "COM_GlareStreaksOperation.h" -#include "BLI_math.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_GlareThresholdOperation.cc b/source/blender/compositor/operations/COM_GlareThresholdOperation.cc index 1bf7cf5ae07..5b84b4087f4 100644 --- a/source/blender/compositor/operations/COM_GlareThresholdOperation.cc +++ b/source/blender/compositor/operations/COM_GlareThresholdOperation.cc @@ -17,7 +17,6 @@ */ #include "COM_GlareThresholdOperation.h" -#include "BLI_math.h" #include "IMB_colormanagement.h" diff --git a/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cc b/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cc index 5ae868c5964..d083133cb3e 100644 --- a/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cc +++ b/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cc @@ -18,7 +18,7 @@ #include "COM_HueSaturationValueCorrectOperation.h" -#include "BLI_math.h" +#include "BLI_math_vector.h" #include "BKE_colortools.h" diff --git a/source/blender/compositor/operations/COM_ImageOperation.cc b/source/blender/compositor/operations/COM_ImageOperation.cc index ff389093f5a..773b61bc225 100644 --- a/source/blender/compositor/operations/COM_ImageOperation.cc +++ b/source/blender/compositor/operations/COM_ImageOperation.cc @@ -18,19 +18,12 @@ #include "COM_ImageOperation.h" -#include "BKE_image.h" #include "BKE_scene.h" -#include "BLI_listbase.h" -#include "BLI_math.h" -#include "DNA_image_types.h" #include "IMB_colormanagement.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "RE_pipeline.h" -#include "RE_texture.h" - namespace blender::compositor { BaseImageOperation::BaseImageOperation() diff --git a/source/blender/compositor/operations/COM_InpaintOperation.cc b/source/blender/compositor/operations/COM_InpaintOperation.cc index 5d440dd7d76..163699caa14 100644 --- a/source/blender/compositor/operations/COM_InpaintOperation.cc +++ b/source/blender/compositor/operations/COM_InpaintOperation.cc @@ -19,9 +19,6 @@ #include "MEM_guardedalloc.h" #include "COM_InpaintOperation.h" -#include "COM_OpenCLDevice.h" - -#include "BLI_math.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_KeyingBlurOperation.cc b/source/blender/compositor/operations/COM_KeyingBlurOperation.cc index d5ebd5e9df7..d61c63cfc04 100644 --- a/source/blender/compositor/operations/COM_KeyingBlurOperation.cc +++ b/source/blender/compositor/operations/COM_KeyingBlurOperation.cc @@ -18,11 +18,6 @@ #include "COM_KeyingBlurOperation.h" -#include "MEM_guardedalloc.h" - -#include "BLI_listbase.h" -#include "BLI_math.h" - namespace blender::compositor { KeyingBlurOperation::KeyingBlurOperation() diff --git a/source/blender/compositor/operations/COM_KeyingClipOperation.cc b/source/blender/compositor/operations/COM_KeyingClipOperation.cc index 817c920ed91..d4ef43b6521 100644 --- a/source/blender/compositor/operations/COM_KeyingClipOperation.cc +++ b/source/blender/compositor/operations/COM_KeyingClipOperation.cc @@ -18,11 +18,6 @@ #include "COM_KeyingClipOperation.h" -#include "MEM_guardedalloc.h" - -#include "BLI_listbase.h" -#include "BLI_math.h" - namespace blender::compositor { KeyingClipOperation::KeyingClipOperation() diff --git a/source/blender/compositor/operations/COM_KeyingDespillOperation.cc b/source/blender/compositor/operations/COM_KeyingDespillOperation.cc index 620b767e584..2c91d7771bf 100644 --- a/source/blender/compositor/operations/COM_KeyingDespillOperation.cc +++ b/source/blender/compositor/operations/COM_KeyingDespillOperation.cc @@ -18,11 +18,6 @@ #include "COM_KeyingDespillOperation.h" -#include "MEM_guardedalloc.h" - -#include "BLI_listbase.h" -#include "BLI_math.h" - namespace blender::compositor { KeyingDespillOperation::KeyingDespillOperation() diff --git a/source/blender/compositor/operations/COM_KeyingOperation.cc b/source/blender/compositor/operations/COM_KeyingOperation.cc index 3edb5a5d34e..76f30726522 100644 --- a/source/blender/compositor/operations/COM_KeyingOperation.cc +++ b/source/blender/compositor/operations/COM_KeyingOperation.cc @@ -18,11 +18,6 @@ #include "COM_KeyingOperation.h" -#include "MEM_guardedalloc.h" - -#include "BLI_listbase.h" -#include "BLI_math.h" - namespace blender::compositor { static float get_pixel_saturation(const float pixelColor[4], diff --git a/source/blender/compositor/operations/COM_KeyingScreenOperation.cc b/source/blender/compositor/operations/COM_KeyingScreenOperation.cc index b4840926d55..32a29ed62bb 100644 --- a/source/blender/compositor/operations/COM_KeyingScreenOperation.cc +++ b/source/blender/compositor/operations/COM_KeyingScreenOperation.cc @@ -18,12 +18,6 @@ #include "COM_KeyingScreenOperation.h" -#include "MEM_guardedalloc.h" - -#include "BLI_listbase.h" -#include "BLI_math.h" -#include "BLI_math_color.h" - #include "BKE_movieclip.h" #include "BKE_tracking.h" diff --git a/source/blender/compositor/operations/COM_LuminanceMatteOperation.cc b/source/blender/compositor/operations/COM_LuminanceMatteOperation.cc index c642c60b912..e6cb1d8f718 100644 --- a/source/blender/compositor/operations/COM_LuminanceMatteOperation.cc +++ b/source/blender/compositor/operations/COM_LuminanceMatteOperation.cc @@ -17,7 +17,6 @@ */ #include "COM_LuminanceMatteOperation.h" -#include "BLI_math.h" #include "IMB_colormanagement.h" diff --git a/source/blender/compositor/operations/COM_MapUVOperation.cc b/source/blender/compositor/operations/COM_MapUVOperation.cc index ba38e583b30..194fa504978 100644 --- a/source/blender/compositor/operations/COM_MapUVOperation.cc +++ b/source/blender/compositor/operations/COM_MapUVOperation.cc @@ -17,7 +17,6 @@ */ #include "COM_MapUVOperation.h" -#include "BLI_math.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_MaskOperation.cc b/source/blender/compositor/operations/COM_MaskOperation.cc index 65b89a8c79a..5044df0b128 100644 --- a/source/blender/compositor/operations/COM_MaskOperation.cc +++ b/source/blender/compositor/operations/COM_MaskOperation.cc @@ -18,11 +18,6 @@ #include "COM_MaskOperation.h" -#include "MEM_guardedalloc.h" - -#include "BLI_listbase.h" -#include "BLI_math.h" - #include "BKE_lib_id.h" #include "BKE_mask.h" diff --git a/source/blender/compositor/operations/COM_MathBaseOperation.cc b/source/blender/compositor/operations/COM_MathBaseOperation.cc index d3fb83caf7c..3a447ad53e0 100644 --- a/source/blender/compositor/operations/COM_MathBaseOperation.cc +++ b/source/blender/compositor/operations/COM_MathBaseOperation.cc @@ -18,8 +18,6 @@ #include "COM_MathBaseOperation.h" -#include "BLI_math.h" - namespace blender::compositor { MathBaseOperation::MathBaseOperation() diff --git a/source/blender/compositor/operations/COM_MixOperation.cc b/source/blender/compositor/operations/COM_MixOperation.cc index 895d32e6fee..d16fbb1324e 100644 --- a/source/blender/compositor/operations/COM_MixOperation.cc +++ b/source/blender/compositor/operations/COM_MixOperation.cc @@ -18,8 +18,6 @@ #include "COM_MixOperation.h" -#include "BLI_math.h" - namespace blender::compositor { /* ******** Mix Base Operation ******** */ diff --git a/source/blender/compositor/operations/COM_MovieClipOperation.cc b/source/blender/compositor/operations/COM_MovieClipOperation.cc index 1ca33b12432..6430e2af0db 100644 --- a/source/blender/compositor/operations/COM_MovieClipOperation.cc +++ b/source/blender/compositor/operations/COM_MovieClipOperation.cc @@ -18,9 +18,6 @@ #include "COM_MovieClipOperation.h" -#include "BLI_listbase.h" -#include "BLI_math.h" - #include "BKE_image.h" #include "BKE_movieclip.h" diff --git a/source/blender/compositor/operations/COM_MovieDistortionOperation.cc b/source/blender/compositor/operations/COM_MovieDistortionOperation.cc index 49f43d2c1a7..ff942fda54f 100644 --- a/source/blender/compositor/operations/COM_MovieDistortionOperation.cc +++ b/source/blender/compositor/operations/COM_MovieDistortionOperation.cc @@ -19,9 +19,6 @@ #include "COM_MovieDistortionOperation.h" #include "BKE_movieclip.h" -#include "BKE_tracking.h" - -#include "BLI_linklist.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_MultilayerImageOperation.cc b/source/blender/compositor/operations/COM_MultilayerImageOperation.cc index 3a5de944a00..2974cd8dbd1 100644 --- a/source/blender/compositor/operations/COM_MultilayerImageOperation.cc +++ b/source/blender/compositor/operations/COM_MultilayerImageOperation.cc @@ -19,7 +19,6 @@ #include "COM_MultilayerImageOperation.h" #include "IMB_imbuf.h" -#include "IMB_imbuf_types.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cc b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cc index d436b00a6e3..cc177a82056 100644 --- a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cc +++ b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cc @@ -17,22 +17,11 @@ */ #include "COM_OutputFileMultiViewOperation.h" -#include "COM_OutputFileOperation.h" -#include <cstring> - -#include "BLI_listbase.h" -#include "BLI_path_util.h" -#include "BLI_string.h" - -#include "BKE_global.h" #include "BKE_image.h" #include "BKE_main.h" #include "BKE_scene.h" -#include "DNA_color_types.h" -#include "MEM_guardedalloc.h" - #include "IMB_colormanagement.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.cc b/source/blender/compositor/operations/COM_OutputFileOperation.cc index 79be95bb686..6ccff9bd0ef 100644 --- a/source/blender/compositor/operations/COM_OutputFileOperation.cc +++ b/source/blender/compositor/operations/COM_OutputFileOperation.cc @@ -18,21 +18,15 @@ #include "COM_OutputFileOperation.h" -#include "COM_MetaData.h" - -#include <cstring> - #include "BLI_listbase.h" #include "BLI_path_util.h" #include "BLI_string.h" -#include "BKE_global.h" #include "BKE_image.h" #include "BKE_main.h" #include "BKE_scene.h" #include "DNA_color_types.h" -#include "MEM_guardedalloc.h" #include "IMB_colormanagement.h" #include "IMB_imbuf.h" diff --git a/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cc b/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cc index 65cd08456ef..92733186979 100644 --- a/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cc +++ b/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cc @@ -17,15 +17,6 @@ #include "COM_PlaneCornerPinOperation.h" #include "COM_ConstantOperation.h" -#include "COM_ReadBufferOperation.h" - -#include "MEM_guardedalloc.h" - -#include "BLI_listbase.h" -#include "BLI_math.h" -#include "BLI_math_color.h" - -#include "BKE_node.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cc b/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cc index 31ef41789fd..259c772e296 100644 --- a/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cc +++ b/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cc @@ -18,15 +18,8 @@ #include "COM_PlaneDistortCommonOperation.h" -#include "MEM_guardedalloc.h" - #include "BLI_jitter_2d.h" -#include "BLI_listbase.h" -#include "BLI_math.h" -#include "BLI_math_color.h" -#include "BKE_movieclip.h" -#include "BKE_node.h" #include "BKE_tracking.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_PlaneTrackOperation.cc b/source/blender/compositor/operations/COM_PlaneTrackOperation.cc index 7226a133a52..593c3604568 100644 --- a/source/blender/compositor/operations/COM_PlaneTrackOperation.cc +++ b/source/blender/compositor/operations/COM_PlaneTrackOperation.cc @@ -17,16 +17,8 @@ */ #include "COM_PlaneTrackOperation.h" -#include "COM_ReadBufferOperation.h" - -#include "MEM_guardedalloc.h" - -#include "BLI_listbase.h" -#include "BLI_math.h" -#include "BLI_math_color.h" #include "BKE_movieclip.h" -#include "BKE_node.h" #include "BKE_tracking.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_PreviewOperation.cc b/source/blender/compositor/operations/COM_PreviewOperation.cc index 34520264d54..c08ce82690d 100644 --- a/source/blender/compositor/operations/COM_PreviewOperation.cc +++ b/source/blender/compositor/operations/COM_PreviewOperation.cc @@ -17,21 +17,9 @@ */ #include "COM_PreviewOperation.h" -#include "BKE_image.h" -#include "BLI_listbase.h" -#include "BLI_math.h" -#include "BLI_math_color.h" -#include "BLI_utildefines.h" -#include "COM_defines.h" -#include "MEM_guardedalloc.h" -#include "PIL_time.h" -#include "WM_api.h" -#include "WM_types.h" #include "BKE_node.h" #include "IMB_colormanagement.h" -#include "IMB_imbuf.h" -#include "IMB_imbuf_types.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cc b/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cc index 2982f59a019..fb8bd2f145f 100644 --- a/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cc +++ b/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cc @@ -19,9 +19,6 @@ #include "COM_ProjectorLensDistortionOperation.h" #include "COM_ConstantOperation.h" -#include "BLI_math.h" -#include "BLI_utildefines.h" - namespace blender::compositor { ProjectorLensDistortionOperation::ProjectorLensDistortionOperation() diff --git a/source/blender/compositor/operations/COM_ReadBufferOperation.cc b/source/blender/compositor/operations/COM_ReadBufferOperation.cc index 599370751bb..0a41ba2d0be 100644 --- a/source/blender/compositor/operations/COM_ReadBufferOperation.cc +++ b/source/blender/compositor/operations/COM_ReadBufferOperation.cc @@ -17,8 +17,9 @@ */ #include "COM_ReadBufferOperation.h" + +#include "COM_ExecutionGroup.h" #include "COM_WriteBufferOperation.h" -#include "COM_defines.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.cc b/source/blender/compositor/operations/COM_RenderLayersProg.cc index 2ac551ffe6f..6045a416d74 100644 --- a/source/blender/compositor/operations/COM_RenderLayersProg.cc +++ b/source/blender/compositor/operations/COM_RenderLayersProg.cc @@ -18,19 +18,7 @@ #include "COM_RenderLayersProg.h" -#include "COM_MetaData.h" - #include "BKE_image.h" -#include "BKE_scene.h" - -#include "BLI_listbase.h" -#include "BLI_string.h" -#include "BLI_string_ref.hh" - -#include "DNA_scene_types.h" - -#include "RE_pipeline.h" -#include "RE_texture.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_RotateOperation.cc b/source/blender/compositor/operations/COM_RotateOperation.cc index 9e26c93feac..8aca25bb2a0 100644 --- a/source/blender/compositor/operations/COM_RotateOperation.cc +++ b/source/blender/compositor/operations/COM_RotateOperation.cc @@ -17,9 +17,6 @@ */ #include "COM_RotateOperation.h" -#include "COM_ConstantOperation.h" - -#include "BLI_math.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_SMAAOperation.cc b/source/blender/compositor/operations/COM_SMAAOperation.cc index 4153b9c8523..8c30976d200 100644 --- a/source/blender/compositor/operations/COM_SMAAOperation.cc +++ b/source/blender/compositor/operations/COM_SMAAOperation.cc @@ -20,7 +20,6 @@ #include "COM_SMAAOperation.h" #include "BKE_node.h" -#include "BLI_math.h" #include "COM_SMAAAreaTexture.h" extern "C" { diff --git a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cc b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cc index 21d9210bdac..bef5beb2bce 100644 --- a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cc +++ b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cc @@ -17,11 +17,10 @@ */ #include "COM_ScreenLensDistortionOperation.h" + #include "COM_ConstantOperation.h" -#include "BLI_math.h" #include "BLI_rand.h" -#include "BLI_utildefines.h" #include "PIL_time.h" diff --git a/source/blender/compositor/operations/COM_SetVectorOperation.cc b/source/blender/compositor/operations/COM_SetVectorOperation.cc index 3e8514f1f59..6f0a947c52d 100644 --- a/source/blender/compositor/operations/COM_SetVectorOperation.cc +++ b/source/blender/compositor/operations/COM_SetVectorOperation.cc @@ -17,7 +17,6 @@ */ #include "COM_SetVectorOperation.h" -#include "COM_defines.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_SplitOperation.cc b/source/blender/compositor/operations/COM_SplitOperation.cc index 47b2bbb7e94..ddc5b6dce13 100644 --- a/source/blender/compositor/operations/COM_SplitOperation.cc +++ b/source/blender/compositor/operations/COM_SplitOperation.cc @@ -17,15 +17,6 @@ */ #include "COM_SplitOperation.h" -#include "BKE_image.h" -#include "BLI_listbase.h" -#include "BLI_math_color.h" -#include "BLI_math_vector.h" -#include "BLI_utildefines.h" -#include "MEM_guardedalloc.h" - -#include "IMB_imbuf.h" -#include "IMB_imbuf_types.h" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_TextureOperation.cc b/source/blender/compositor/operations/COM_TextureOperation.cc index c06e3ac7cb0..cfd22b16c4e 100644 --- a/source/blender/compositor/operations/COM_TextureOperation.cc +++ b/source/blender/compositor/operations/COM_TextureOperation.cc @@ -22,9 +22,6 @@ #include "BKE_image.h" #include "BKE_node.h" -#include "BLI_listbase.h" -#include "BLI_threads.h" - namespace blender::compositor { TextureBaseOperation::TextureBaseOperation() diff --git a/source/blender/compositor/operations/COM_TonemapOperation.cc b/source/blender/compositor/operations/COM_TonemapOperation.cc index cb671c54abe..2ff54571c24 100644 --- a/source/blender/compositor/operations/COM_TonemapOperation.cc +++ b/source/blender/compositor/operations/COM_TonemapOperation.cc @@ -17,10 +17,8 @@ */ #include "COM_TonemapOperation.h" -#include "COM_ExecutionSystem.h" -#include "BLI_math.h" -#include "BLI_utildefines.h" +#include "COM_ExecutionSystem.h" #include "IMB_colormanagement.h" diff --git a/source/blender/compositor/operations/COM_TrackPositionOperation.cc b/source/blender/compositor/operations/COM_TrackPositionOperation.cc index 1929c578177..d6f0ce9d24c 100644 --- a/source/blender/compositor/operations/COM_TrackPositionOperation.cc +++ b/source/blender/compositor/operations/COM_TrackPositionOperation.cc @@ -18,12 +18,6 @@ #include "COM_TrackPositionOperation.h" -#include "MEM_guardedalloc.h" - -#include "BLI_listbase.h" -#include "BLI_math.h" -#include "BLI_math_color.h" - #include "BKE_movieclip.h" #include "BKE_node.h" #include "BKE_tracking.h" diff --git a/source/blender/compositor/operations/COM_TransformOperation.cc b/source/blender/compositor/operations/COM_TransformOperation.cc index 5f6e9ed4d21..38bb443bdea 100644 --- a/source/blender/compositor/operations/COM_TransformOperation.cc +++ b/source/blender/compositor/operations/COM_TransformOperation.cc @@ -17,12 +17,9 @@ */ #include "COM_TransformOperation.h" -#include "COM_ConstantOperation.h" #include "COM_RotateOperation.h" #include "COM_ScaleOperation.h" -#include "BLI_math.h" - namespace blender::compositor { TransformOperation::TransformOperation() diff --git a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cc b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cc index c524447a4fa..d31290acac7 100644 --- a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cc +++ b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cc @@ -17,12 +17,8 @@ */ #include "COM_VariableSizeBokehBlurOperation.h" -#include "BLI_math.h" -#include "COM_ExecutionSystem.h" #include "COM_OpenCLDevice.h" -#include "RE_pipeline.h" - namespace blender::compositor { VariableSizeBokehBlurOperation::VariableSizeBokehBlurOperation() diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.cc b/source/blender/compositor/operations/COM_VectorBlurOperation.cc index 63956410b60..57053470d7f 100644 --- a/source/blender/compositor/operations/COM_VectorBlurOperation.cc +++ b/source/blender/compositor/operations/COM_VectorBlurOperation.cc @@ -16,12 +16,7 @@ * Copyright 2011, Blender Foundation. */ -#include <cstring> - -#include "MEM_guardedalloc.h" - #include "BLI_jitter_2d.h" -#include "BLI_math.h" #include "COM_VectorBlurOperation.h" diff --git a/source/blender/compositor/operations/COM_ViewerOperation.cc b/source/blender/compositor/operations/COM_ViewerOperation.cc index 1faff0fd07f..b0cfe90088a 100644 --- a/source/blender/compositor/operations/COM_ViewerOperation.cc +++ b/source/blender/compositor/operations/COM_ViewerOperation.cc @@ -19,15 +19,7 @@ #include "COM_ViewerOperation.h" #include "BKE_image.h" #include "BKE_scene.h" -#include "BLI_listbase.h" -#include "BLI_math_color.h" -#include "BLI_math_vector.h" -#include "BLI_utildefines.h" #include "COM_ExecutionSystem.h" -#include "MEM_guardedalloc.h" -#include "PIL_time.h" -#include "WM_api.h" -#include "WM_types.h" #include "IMB_colormanagement.h" #include "IMB_imbuf.h" diff --git a/source/blender/compositor/operations/COM_WriteBufferOperation.cc b/source/blender/compositor/operations/COM_WriteBufferOperation.cc index a1c1e514eb7..5d3f1ea3e1e 100644 --- a/source/blender/compositor/operations/COM_WriteBufferOperation.cc +++ b/source/blender/compositor/operations/COM_WriteBufferOperation.cc @@ -18,8 +18,6 @@ #include "COM_WriteBufferOperation.h" #include "COM_OpenCLDevice.h" -#include "COM_defines.h" -#include <cstdio> namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_ZCombineOperation.cc b/source/blender/compositor/operations/COM_ZCombineOperation.cc index 7050c3b2d83..1b04c749c8b 100644 --- a/source/blender/compositor/operations/COM_ZCombineOperation.cc +++ b/source/blender/compositor/operations/COM_ZCombineOperation.cc @@ -17,7 +17,6 @@ */ #include "COM_ZCombineOperation.h" -#include "BLI_utildefines.h" namespace blender::compositor { |