[Bf-blender-cvs] [ecb8a574c75] master: Cleanup: remove unused includes in Compositor
Manuel Castilla
noreply at git.blender.org
Wed Oct 13 23:46:45 CEST 2021
Commit: ecb8a574c752068de9f8d9eb98f54db1569df2f7
Author: Manuel Castilla
Date: Wed Oct 13 23:00:24 2021 +0200
Branches: master
https://developer.blender.org/rBecb8a574c752068de9f8d9eb98f54db1569df2f7
Cleanup: remove unused includes in Compositor
And move unneeded includes in frequently used headers
to source files.
Slightly reduces compile time.
===================================================================
M source/blender/compositor/COM_defines.h
M source/blender/compositor/intern/COM_BufferRange.h
M source/blender/compositor/intern/COM_CPUDevice.cc
M source/blender/compositor/intern/COM_ChunkOrder.cc
M source/blender/compositor/intern/COM_CompositorContext.cc
M source/blender/compositor/intern/COM_CompositorContext.h
M source/blender/compositor/intern/COM_ConstantFolder.cc
M source/blender/compositor/intern/COM_ConstantFolder.h
M source/blender/compositor/intern/COM_Converter.cc
M source/blender/compositor/intern/COM_Converter.h
M source/blender/compositor/intern/COM_Debug.cc
M source/blender/compositor/intern/COM_Debug.h
M source/blender/compositor/intern/COM_Device.h
M source/blender/compositor/intern/COM_Enums.cc
M source/blender/compositor/intern/COM_ExecutionGroup.cc
M source/blender/compositor/intern/COM_ExecutionGroup.h
M source/blender/compositor/intern/COM_ExecutionModel.cc
M source/blender/compositor/intern/COM_ExecutionModel.h
M source/blender/compositor/intern/COM_ExecutionSystem.cc
M source/blender/compositor/intern/COM_ExecutionSystem.h
M source/blender/compositor/intern/COM_FullFrameExecutionModel.cc
M source/blender/compositor/intern/COM_FullFrameExecutionModel.h
M source/blender/compositor/intern/COM_MemoryBuffer.cc
M source/blender/compositor/intern/COM_MemoryBuffer.h
M source/blender/compositor/intern/COM_MemoryProxy.cc
M source/blender/compositor/intern/COM_MetaData.cc
M source/blender/compositor/intern/COM_MultiThreadedRowOperation.h
M source/blender/compositor/intern/COM_Node.cc
M source/blender/compositor/intern/COM_Node.h
M source/blender/compositor/intern/COM_NodeConverter.cc
M source/blender/compositor/intern/COM_NodeGraph.cc
M source/blender/compositor/intern/COM_NodeGraph.h
M source/blender/compositor/intern/COM_NodeOperation.cc
M source/blender/compositor/intern/COM_NodeOperation.h
M source/blender/compositor/intern/COM_NodeOperationBuilder.cc
M source/blender/compositor/intern/COM_NodeOperationBuilder.h
M source/blender/compositor/intern/COM_OpenCLDevice.cc
M source/blender/compositor/intern/COM_OpenCLDevice.h
M source/blender/compositor/intern/COM_SharedOperationBuffers.cc
M source/blender/compositor/intern/COM_SharedOperationBuffers.h
M source/blender/compositor/intern/COM_TiledExecutionModel.h
M source/blender/compositor/intern/COM_WorkPackage.cc
M source/blender/compositor/intern/COM_WorkPackage.h
M source/blender/compositor/intern/COM_WorkScheduler.cc
M source/blender/compositor/intern/COM_WorkScheduler.h
M source/blender/compositor/intern/COM_compositor.cc
M source/blender/compositor/nodes/COM_AlphaOverNode.cc
M source/blender/compositor/nodes/COM_AntiAliasingNode.cc
M source/blender/compositor/nodes/COM_BilateralBlurNode.cc
M source/blender/compositor/nodes/COM_BlurNode.cc
M source/blender/compositor/nodes/COM_BokehBlurNode.cc
M source/blender/compositor/nodes/COM_BokehImageNode.cc
M source/blender/compositor/nodes/COM_BoxMaskNode.cc
M source/blender/compositor/nodes/COM_BrightnessNode.cc
M source/blender/compositor/nodes/COM_ChannelMatteNode.cc
M source/blender/compositor/nodes/COM_ChromaMatteNode.cc
M source/blender/compositor/nodes/COM_ColorBalanceNode.cc
M source/blender/compositor/nodes/COM_ColorCorrectionNode.cc
M source/blender/compositor/nodes/COM_ColorCurveNode.cc
M source/blender/compositor/nodes/COM_ColorExposureNode.cc
M source/blender/compositor/nodes/COM_ColorMatteNode.cc
M source/blender/compositor/nodes/COM_ColorNode.cc
M source/blender/compositor/nodes/COM_ColorRampNode.cc
M source/blender/compositor/nodes/COM_ColorSpillNode.cc
M source/blender/compositor/nodes/COM_ColorToBWNode.cc
M source/blender/compositor/nodes/COM_CompositorNode.cc
M source/blender/compositor/nodes/COM_ConvertAlphaNode.cc
M source/blender/compositor/nodes/COM_CornerPinNode.cc
M source/blender/compositor/nodes/COM_CryptomatteNode.cc
M source/blender/compositor/nodes/COM_DefocusNode.cc
M source/blender/compositor/nodes/COM_DenoiseNode.cc
M source/blender/compositor/nodes/COM_DespeckleNode.cc
M source/blender/compositor/nodes/COM_DifferenceMatteNode.cc
M source/blender/compositor/nodes/COM_DilateErodeNode.cc
M source/blender/compositor/nodes/COM_DirectionalBlurNode.cc
M source/blender/compositor/nodes/COM_DisplaceNode.cc
M source/blender/compositor/nodes/COM_DistanceMatteNode.cc
M source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cc
M source/blender/compositor/nodes/COM_EllipseMaskNode.cc
M source/blender/compositor/nodes/COM_FilterNode.cc
M source/blender/compositor/nodes/COM_FlipNode.cc
M source/blender/compositor/nodes/COM_GammaNode.cc
M source/blender/compositor/nodes/COM_GlareNode.cc
M source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cc
M source/blender/compositor/nodes/COM_HueSaturationValueNode.cc
M source/blender/compositor/nodes/COM_IDMaskNode.cc
M source/blender/compositor/nodes/COM_ImageNode.cc
M source/blender/compositor/nodes/COM_InpaintNode.cc
M source/blender/compositor/nodes/COM_InvertNode.cc
M source/blender/compositor/nodes/COM_KeyingNode.cc
M source/blender/compositor/nodes/COM_KeyingScreenNode.cc
M source/blender/compositor/nodes/COM_LensDistortionNode.cc
M source/blender/compositor/nodes/COM_LuminanceMatteNode.cc
M source/blender/compositor/nodes/COM_MapRangeNode.cc
M source/blender/compositor/nodes/COM_MapUVNode.cc
M source/blender/compositor/nodes/COM_MapValueNode.cc
M source/blender/compositor/nodes/COM_MaskNode.cc
M source/blender/compositor/nodes/COM_MathNode.cc
M source/blender/compositor/nodes/COM_MixNode.cc
M source/blender/compositor/nodes/COM_MovieClipNode.cc
M source/blender/compositor/nodes/COM_MovieDistortionNode.cc
M source/blender/compositor/nodes/COM_NormalNode.cc
M source/blender/compositor/nodes/COM_NormalizeNode.cc
M source/blender/compositor/nodes/COM_OutputFileNode.cc
M source/blender/compositor/nodes/COM_PixelateNode.cc
M source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cc
M source/blender/compositor/nodes/COM_PosterizeNode.cc
M source/blender/compositor/nodes/COM_RenderLayersNode.cc
M source/blender/compositor/nodes/COM_RotateNode.cc
M source/blender/compositor/nodes/COM_ScaleNode.cc
M source/blender/compositor/nodes/COM_SetAlphaNode.cc
M source/blender/compositor/nodes/COM_SocketProxyNode.cc
M source/blender/compositor/nodes/COM_SplitViewerNode.cc
M source/blender/compositor/nodes/COM_Stabilize2dNode.cc
M source/blender/compositor/nodes/COM_SwitchViewNode.cc
M source/blender/compositor/nodes/COM_TextureNode.cc
M source/blender/compositor/nodes/COM_TimeNode.cc
M source/blender/compositor/nodes/COM_TonemapNode.cc
M source/blender/compositor/nodes/COM_TrackPositionNode.cc
M source/blender/compositor/nodes/COM_TransformNode.cc
M source/blender/compositor/nodes/COM_TranslateNode.cc
M source/blender/compositor/nodes/COM_ValueNode.cc
M source/blender/compositor/nodes/COM_VectorBlurNode.cc
M source/blender/compositor/nodes/COM_VectorCurveNode.cc
M source/blender/compositor/nodes/COM_ViewLevelsNode.cc
M source/blender/compositor/nodes/COM_ViewerNode.cc
M source/blender/compositor/nodes/COM_ZCombineNode.cc
M source/blender/compositor/operations/COM_AntiAliasOperation.cc
M source/blender/compositor/operations/COM_BilateralBlurOperation.cc
M source/blender/compositor/operations/COM_BlurBaseOperation.cc
M source/blender/compositor/operations/COM_BokehBlurOperation.cc
M source/blender/compositor/operations/COM_BokehImageOperation.cc
M source/blender/compositor/operations/COM_BoxMaskOperation.cc
M source/blender/compositor/operations/COM_CalculateMeanOperation.cc
M source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cc
M source/blender/compositor/operations/COM_ChannelMatteOperation.cc
M source/blender/compositor/operations/COM_ChromaMatteOperation.cc
M source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cc
M source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cc
M source/blender/compositor/operations/COM_ColorCorrectionOperation.cc
M source/blender/compositor/operations/COM_ColorCurveOperation.cc
M source/blender/compositor/operations/COM_ColorCurveOperation.h
M source/blender/compositor/operations/COM_ColorMatteOperation.cc
M source/blender/compositor/operations/COM_ColorSpillOperation.cc
M source/blender/compositor/operations/COM_CompositorOperation.cc
M source/blender/compositor/operations/COM_CompositorOperation.h
M source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cc
M source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cc
M source/blender/compositor/operations/COM_ConvolutionFilterOperation.cc
M source/blender/compositor/operations/COM_CropOperation.cc
M source/blender/compositor/operations/COM_CurveBaseOperation.h
M source/blender/compositor/operations/COM_DenoiseOperation.cc
M source/blender/compositor/operations/COM_DespeckleOperation.cc
M source/blender/compositor/operations/COM_DifferenceMatteOperation.cc
M source/blender/compositor/operations/COM_DilateErodeOperation.cc
M source/blender/compositor/operations/COM_DirectionalBlurOperation.cc
M source/blender/compositor/operations/COM_DisplaceOperation.cc
M source/blender/compositor/operations/COM_DisplaceSimpleOperation.cc
M source/blender/compositor/operations/COM_DistanceRGBMatteOperation.cc
M source/blender/compositor/operations/COM_DistanceYCCMatteOperation.cc
M source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cc
M source/blender/compositor/operations/COM_EllipseMaskOperation.cc
M source/blender/compositor/operations/COM_FastGaussianBlurOperation.cc
M source/blender/compositor/operations/COM_GammaCorrectOperation.cc
M source/blender/compositor/operations/COM_GammaOperation.cc
M source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cc
M source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cc
M source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cc
M source/blender/compositor/operations/COM_GaussianXBlurOperation.cc
M source/blender/compositor/operations/COM_GaussianYBlurOperation.cc
M source/blender/compositor/operations/COM_GlareBaseOperation.cc
M source/blender/compositor/operations/COM_GlareFogGlowOperation.cc
M source/blender/compositor/operations/COM_GlareGhostOperation.cc
M source/blender/compositor/operations/COM_GlareStreaksOperation.cc
M source/blender/compositor/operations/COM_GlareThresholdOperation.cc
M source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cc
M source/blender/compositor/operations/COM_ImageOperation.cc
M source/blender/compositor/operations/COM_InpaintOperation.cc
M source/blender/compositor/operations/COM_KeyingBlurOperation.cc
M source/blender/compositor/operations/COM_KeyingClipOperation.cc
M source/blender/compositor/operations/COM_KeyingDespillOperation.cc
M source/blender/compositor/operations/COM_KeyingOperation.cc
M source/blender/compositor/operations/COM_KeyingScreenOperation.cc
M source/blender/compositor/operations/COM_LuminanceMatteOperation.cc
M source/blender/compositor/operations/COM_MapUVOperation.cc
M source/blender/compositor/operations/COM_MaskOperation.cc
M source/blender/compositor/operations/COM_MathBaseOperation.cc
M source/blender/compositor/operations/COM_MixOperation.cc
M source/blender/compositor/operations/COM_MovieClipOperation.cc
M source/blender/compositor/operations/COM_MovieDistortionOperation.cc
M source/blender/compositor/operations/COM_MultilayerImageOperation.cc
M source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cc
M source/blender/compositor/operations/COM_OutputFileOperation.cc
M source/blender/compositor/operations/COM_PlaneCornerPinOperation.cc
M source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cc
M source/blender/compositor/operations/COM_PlaneTrackOperation.cc
M source/blender/compositor/operations/COM_PreviewOperation.cc
M source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cc
M source/blender/compositor/operations/COM_ReadBufferOperation.cc
M source/blender/compositor/operations/COM_RenderLayersProg.cc
M source/blender/compositor/operations/COM_RotateOperation.cc
M source/blender/compositor/operations/COM_SMAAOperation.cc
M source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cc
M source/blender/compositor/operations/COM_SetVectorOperation.cc
M source/blender/compositor/operations/COM_SplitOperation.cc
M source/blender/compositor/operations/COM_TextureOperation.cc
M source/blender/compositor/operations/COM_TonemapOperation.cc
M source/blender/compositor/operations/COM_TrackPositionOperation.cc
M source/blender/compositor/operations/COM_TransformOperation.cc
M source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cc
M source/blender/compositor/operations/COM_VectorBlurOperation.cc
M source/blender/compositor/operations/COM_ViewerOperation.cc
M source/blender/compositor/operations/COM_WriteBufferOperation.cc
M source/blender/compositor/operations/COM_ZCombineOperation.cc
===================================================================
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/ble
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list