Style Cleanup: remove preprocessor indentation (updated wiki style guide too)

57 files changed, 122 insertions, 122 deletions

diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.h b/source/blender/compositor/intern/COM_MemoryBuffer.h
index f9cde79c07f..521e3c6231e 100644
--- a/source/blender/compositor/intern/COM_MemoryBuffer.h
+++ b/source/blender/compositor/intern/COM_MemoryBuffer.h
@@ -29,8 +29,8 @@ class MemoryBuffer;
 #include "COM_MemoryProxy.h"
 
 extern "C" {
-	#include "BLI_math.h"
-	#include "BLI_rect.h"
+#  include "BLI_math.h"
+#  include "BLI_rect.h"
 }
 
 /**
diff --git a/source/blender/compositor/intern/COM_WorkScheduler.h b/source/blender/compositor/intern/COM_WorkScheduler.h
index 78bba1e3074..71c5f859418 100644
--- a/source/blender/compositor/intern/COM_WorkScheduler.h
+++ b/source/blender/compositor/intern/COM_WorkScheduler.h
@@ -25,7 +25,7 @@
 
 #include "COM_ExecutionGroup.h"
 extern "C" {
-	#include "BLI_threads.h"
+#  include "BLI_threads.h"
 }
 #include "COM_WorkPackage.h"
 #include "COM_defines.h"
diff --git a/source/blender/compositor/nodes/COM_ImageNode.cpp b/source/blender/compositor/nodes/COM_ImageNode.cpp
index d595afe6a78..5571a186333 100644
--- a/source/blender/compositor/nodes/COM_ImageNode.cpp
+++ b/source/blender/compositor/nodes/COM_ImageNode.cpp
@@ -96,11 +96,11 @@ void ImageNode::convertToOperations(ExecutionSystem *graph, CompositorContext *c
 						/* Passes in the file can differ from passes stored in sockets (#36755).
 						 * Look up the correct file pass using the socket identifier instead.
 						 */
-						#if 0
+#if 0
 						NodeImageLayer *storage = (NodeImageLayer *)bnodeSocket->storage;*/
 						int passindex = storage->pass_index;*/
 						RenderPass *rpass = (RenderPass *)BLI_findlink(&rl->passes, passindex);
-						#endif
+#endif
 						int passindex;
 						RenderPass *rpass;
 						for (rpass = (RenderPass *)rl->passes.first, passindex = 0; rpass; rpass = rpass->next, ++passindex)
diff --git a/source/blender/compositor/nodes/COM_ImageNode.h b/source/blender/compositor/nodes/COM_ImageNode.h
index 12b4da6c8b3..c8d53b405a0 100644
--- a/source/blender/compositor/nodes/COM_ImageNode.h
+++ b/source/blender/compositor/nodes/COM_ImageNode.h
@@ -26,7 +26,7 @@
 #include "DNA_node_types.h"
 #include "DNA_image_types.h"
 extern "C" {
-	#include "RE_engine.h"
+#  include "RE_engine.h"
 }
 
 /**
diff --git a/source/blender/compositor/nodes/COM_KeyingScreenNode.cpp b/source/blender/compositor/nodes/COM_KeyingScreenNode.cpp
index cd1f79235ea..59d889d0c84 100644
--- a/source/blender/compositor/nodes/COM_KeyingScreenNode.cpp
+++ b/source/blender/compositor/nodes/COM_KeyingScreenNode.cpp
@@ -26,7 +26,7 @@
 #include "COM_KeyingScreenOperation.h"
 
 extern "C" {
-	#include "DNA_movieclip_types.h"
+#  include "DNA_movieclip_types.h"
 }
 
 KeyingScreenNode::KeyingScreenNode(bNode *editorNode) : Node(editorNode)
diff --git a/source/blender/compositor/nodes/COM_MaskNode.cpp b/source/blender/compositor/nodes/COM_MaskNode.cpp
index 8d549d09362..65ff443b55b 100644
--- a/source/blender/compositor/nodes/COM_MaskNode.cpp
+++ b/source/blender/compositor/nodes/COM_MaskNode.cpp
@@ -26,7 +26,7 @@
 #include "COM_MaskOperation.h"
 
 extern "C" {
-	#include "DNA_mask_types.h"
+#  include "DNA_mask_types.h"
 }
 
 MaskNode::MaskNode(bNode *editorNode) : Node(editorNode)
diff --git a/source/blender/compositor/nodes/COM_MovieClipNode.cpp b/source/blender/compositor/nodes/COM_MovieClipNode.cpp
index 10dd72ec7bf..041fa9f7c4c 100644
--- a/source/blender/compositor/nodes/COM_MovieClipNode.cpp
+++ b/source/blender/compositor/nodes/COM_MovieClipNode.cpp
@@ -27,10 +27,10 @@
 #include "COM_ConvertColorProfileOperation.h"
 
 extern "C" {
-	#include "DNA_movieclip_types.h"
-	#include "BKE_movieclip.h"
-	#include "BKE_tracking.h"
-	#include "IMB_imbuf.h"
+#  include "DNA_movieclip_types.h"
+#  include "BKE_movieclip.h"
+#  include "BKE_tracking.h"
+#  include "IMB_imbuf.h"
 }
 
 MovieClipNode::MovieClipNode(bNode *editorNode) : Node(editorNode)
diff --git a/source/blender/compositor/nodes/COM_MuteNode.cpp b/source/blender/compositor/nodes/COM_MuteNode.cpp
index de12fff3591..5155b55a2ec 100644
--- a/source/blender/compositor/nodes/COM_MuteNode.cpp
+++ b/source/blender/compositor/nodes/COM_MuteNode.cpp
@@ -27,7 +27,7 @@
 #include "COM_SetColorOperation.h"
 
 extern "C" {
-	#include "BLI_listbase.h"
+#  include "BLI_listbase.h"
 }
 
 MuteNode::MuteNode(bNode *editorNode) : Node(editorNode)
diff --git a/source/blender/compositor/nodes/COM_MuteNode.h b/source/blender/compositor/nodes/COM_MuteNode.h
index 2e5250e625e..7b0f1c2c298 100644
--- a/source/blender/compositor/nodes/COM_MuteNode.h
+++ b/source/blender/compositor/nodes/COM_MuteNode.h
@@ -28,7 +28,7 @@
 #include "COM_Node.h"
 
 extern "C" {
-	#include "BKE_node.h"
+#  include "BKE_node.h"
 }
 
 /**
diff --git a/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp b/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp
index d6434c26c7d..f52c696b772 100644
--- a/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp
+++ b/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp
@@ -28,9 +28,9 @@
 #include "COM_PlaneTrackWarpImageOperation.h"
 
 extern "C" {
-	#include "BKE_node.h"
-	#include "BKE_movieclip.h"
-	#include "BKE_tracking.h"
+#  include "BKE_node.h"
+#  include "BKE_movieclip.h"
+#  include "BKE_tracking.h"
 }
 
 PlaneTrackDeformNode::PlaneTrackDeformNode(bNode *editorNode) : Node(editorNode)
diff --git a/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h b/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h
index cf173cd19f9..3c37f4474dd 100644
--- a/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h
+++ b/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h
@@ -23,8 +23,8 @@
 #include "DNA_node_types.h"
 
 extern "C" {
-	#include "DNA_movieclip_types.h"
-	#include "DNA_node_types.h"
+#  include "DNA_movieclip_types.h"
+#  include "DNA_node_types.h"
 }
 
 /**
diff --git a/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp b/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
index a579503a829..8f17c4d9345 100644
--- a/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
+++ b/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
@@ -29,8 +29,8 @@
 #include "COM_SetSamplerOperation.h"
 
 extern "C" {
-	#include "DNA_movieclip_types.h"
-	#include "BKE_tracking.h"
+#  include "DNA_movieclip_types.h"
+#  include "BKE_tracking.h"
 }
 
 Stabilize2dNode::Stabilize2dNode(bNode *editorNode) : Node(editorNode)
diff --git a/source/blender/compositor/nodes/COM_TimeNode.cpp b/source/blender/compositor/nodes/COM_TimeNode.cpp
index 00ca797bd9b..83f99a16d9f 100644
--- a/source/blender/compositor/nodes/COM_TimeNode.cpp
+++ b/source/blender/compositor/nodes/COM_TimeNode.cpp
@@ -24,7 +24,7 @@
 #include "COM_SetValueOperation.h"
 #include "COM_ExecutionSystem.h"
 extern "C" {
-	#include "BKE_colortools.h"
+#  include "BKE_colortools.h"
 }
 #include "BLI_utildefines.h"
 
diff --git a/source/blender/compositor/nodes/COM_TrackPositionNode.cpp b/source/blender/compositor/nodes/COM_TrackPositionNode.cpp
index c5474e0ce70..bb8cecc60ad 100644
--- a/source/blender/compositor/nodes/COM_TrackPositionNode.cpp
+++ b/source/blender/compositor/nodes/COM_TrackPositionNode.cpp
@@ -26,9 +26,9 @@
 #include "COM_TrackPositionOperation.h"
 
 extern "C" {
-	#include "DNA_movieclip_types.h"
+#  include "DNA_movieclip_types.h"
 
-	#include "BKE_node.h"
+#  include "BKE_node.h"
 }
 
 TrackPositionNode::TrackPositionNode(bNode *editorNode) : Node(editorNode)
diff --git a/source/blender/compositor/operations/COM_AntiAliasOperation.cpp b/source/blender/compositor/operations/COM_AntiAliasOperation.cpp
index 867053bf1d2..995c61589cc 100644
--- a/source/blender/compositor/operations/COM_AntiAliasOperation.cpp
+++ b/source/blender/compositor/operations/COM_AntiAliasOperation.cpp
@@ -27,7 +27,7 @@
 #include "MEM_guardedalloc.h"
 
 extern "C" {
-	#include "RE_render_ext.h"
+#  include "RE_render_ext.h"
 }
 
 
diff --git a/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp b/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
index 5f5eca96378..2527f13c3ed 100644
--- a/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_BilateralBlurOperation.cpp
@@ -24,7 +24,7 @@
 #include "BLI_math.h"
 
 extern "C" {
-	#include "RE_pipeline.h"
+#  include "RE_pipeline.h"
 }
 
 BilateralBlurOperation::BilateralBlurOperation() : NodeOperation()
diff --git a/source/blender/compositor/operations/COM_BlurBaseOperation.cpp b/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
index dfff2bfeafb..c8d53b6992d 100644
--- a/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
+++ b/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
@@ -25,7 +25,7 @@
 #include "MEM_guardedalloc.h"
 
 extern "C" {
-	#include "RE_pipeline.h"
+#  include "RE_pipeline.h"
 }
 
 BlurBaseOperation::BlurBaseOperation(DataType data_type) : NodeOperation()
diff --git a/source/blender/compositor/operations/COM_BokehBlurOperation.cpp b/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
index 7f17db1d31b..f5bca5371e6 100644
--- a/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
@@ -25,7 +25,7 @@
 #include "COM_OpenCLDevice.h"
 
 extern "C" {
-	#include "RE_pipeline.h"
+#  include "RE_pipeline.h"
 }
 
 BokehBlurOperation::BokehBlurOperation() : NodeOperation()
diff --git a/source/blender/compositor/operations/COM_ColorCurveOperation.cpp b/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
index 1115b2ab239..19deb2f2ba0 100644
--- a/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
+++ b/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
@@ -25,7 +25,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-	#include "BKE_colortools.h"
+#  include "BKE_colortools.h"
 #ifdef __cplusplus
 }
 #include "MEM_guardedalloc.h"
diff --git a/source/blender/compositor/operations/COM_ColorRampOperation.cpp b/source/blender/compositor/operations/COM_ColorRampOperation.cpp
index fd3380d594e..84d36034ec6 100644
--- a/source/blender/compositor/operations/COM_ColorRampOperation.cpp
+++ b/source/blender/compositor/operations/COM_ColorRampOperation.cpp
@@ -25,7 +25,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-	#include "BKE_texture.h"
+#  include "BKE_texture.h"
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/compositor/operations/COM_CompositorOperation.cpp b/source/blender/compositor/operations/COM_CompositorOperation.cpp
index 3d4b771fecc..d4629a8d527 100644
--- a/source/blender/compositor/operations/COM_CompositorOperation.cpp
+++ b/source/blender/compositor/operations/COM_CompositorOperation.cpp
@@ -26,12 +26,12 @@
 #include "BKE_image.h"
 
 extern "C" {
-	#include "BLI_threads.h"
-	#include "RE_pipeline.h"
-	#include "RE_shader_ext.h"
-	#include "RE_render_ext.h"
-	#include "MEM_guardedalloc.h"
-	#include "render_types.h"
+#  include "BLI_threads.h"
+#  include "RE_pipeline.h"
+#  include "RE_shader_ext.h"
+#  include "RE_render_ext.h"
+#  include "MEM_guardedalloc.h"
+#  include "render_types.h"
 }
 #include "PIL_time.h"
 
diff --git a/source/blender/compositor/operations/COM_ConvertColorProfileOperation.cpp b/source/blender/compositor/operations/COM_ConvertColorProfileOperation.cpp
index cb269b16bf4..b99940a8862 100644
--- a/source/blender/compositor/operations/COM_ConvertColorProfileOperation.cpp
+++ b/source/blender/compositor/operations/COM_ConvertColorProfileOperation.cpp
@@ -23,7 +23,7 @@
 #include "COM_ConvertColorProfileOperation.h"
 
 extern "C" {
-	#include "IMB_imbuf.h"
+#  include "IMB_imbuf.h"
 }
 ConvertColorProfileOperation::ConvertColorProfileOperation() : NodeOperation()
 {
diff --git a/source/blender/compositor/operations/COM_CurveBaseOperation.cpp b/source/blender/compositor/operations/COM_CurveBaseOperation.cpp
index 36c49859880..408395bfcf0 100644
--- a/source/blender/compositor/operations/COM_CurveBaseOperation.cpp
+++ b/source/blender/compositor/operations/COM_CurveBaseOperation.cpp
@@ -25,7 +25,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-	#include "BKE_colortools.h"
+#  include "BKE_colortools.h"
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp b/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
index d6c25574d01..0cea2a7183f 100644
--- a/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
@@ -24,7 +24,7 @@
 #include "BLI_math.h"
 #include "COM_OpenCLDevice.h"
 extern "C" {
-	#include "RE_pipeline.h"
+#  include "RE_pipeline.h"
 }
 
 DirectionalBlurOperation::DirectionalBlurOperation() : NodeOperation()
diff --git a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
index 2fdfd392d5d..400c6b5e3b1 100644
--- a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
@@ -26,7 +26,7 @@
 #include "MEM_guardedalloc.h"
 
 extern "C" {
-	#include "RE_pipeline.h"
+#  include "RE_pipeline.h"
 }
 
 GaussianAlphaXBlurOperation::GaussianAlphaXBlurOperation() : BlurBaseOperation(COM_DT_VALUE)
diff --git a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
index e8b5eec581e..4866fb9b428 100644
--- a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
@@ -26,7 +26,7 @@
 #include "MEM_guardedalloc.h"
 
 extern "C" {
-	#include "RE_pipeline.h"
+#  include "RE_pipeline.h"
 }
 
 GaussianAlphaYBlurOperation::GaussianAlphaYBlurOperation() : BlurBaseOperation(COM_DT_VALUE)
diff --git a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
index c236c73e50f..41d1fe65b11 100644
--- a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
@@ -24,7 +24,7 @@
 #include "BLI_math.h"
 #include "MEM_guardedalloc.h"
 extern "C" {
-	#include "RE_pipeline.h"
+#  include "RE_pipeline.h"
 }
 
 GaussianBokehBlurOperation::GaussianBokehBlurOperation() : BlurBaseOperation(COM_DT_COLOR)
diff --git a/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
index 93cfa4bcf93..648ca0965c8 100644
--- a/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
@@ -25,7 +25,7 @@
 #include "MEM_guardedalloc.h"
 
 extern "C" {
-	#include "RE_pipeline.h"
+#  include "RE_pipeline.h"
 }
 
 GaussianXBlurOperation::GaussianXBlurOperation() : BlurBaseOperation(COM_DT_COLOR)
diff --git a/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
index 118de6bb846..f58e3a2b4f2 100644
--- a/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
@@ -25,7 +25,7 @@
 #include "MEM_guardedalloc.h"
 
 extern "C" {
-	#include "RE_pipeline.h"
+#  include "RE_pipeline.h"
 }
 
 GaussianYBlurOperation::GaussianYBlurOperation() : BlurBaseOperation(COM_DT_COLOR)
diff --git a/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp b/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
index 592ad114113..f656b7f4892 100644
--- a/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
+++ b/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp
@@ -147,13 +147,13 @@ static void FHT2D(fREAL *data, unsigned int Mx, unsigned int My,
 	else {  // rectangular
 		unsigned int k, Nym = Ny - 1, stm = 1 << (Mx + My);
 		for (i = 0; stm > 0; i++) {
-			#define PRED(k) (((k & Nym) << Mx) + (k >> My))
+#define PRED(k) (((k & Nym) << Mx) + (k >> My))
 			for (j = PRED(i); j > i; j = PRED(j)) ;
 			if (j < i) continue;
 			for (k = i, j = PRED(i); j != i; k = j, j = PRED(j), stm--) {
 				t = data[j], data[j] = data[k], data[k] = t;
 			}
-			#undef PRED
+#undef PRED
 			stm--;
 		}
 	}
diff --git a/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp b/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp
index 6bbaac8e303..2cdf0170fbd 100644
--- a/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp
+++ b/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp
@@ -27,7 +27,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-	#include "BKE_colortools.h"
+#  include "BKE_colortools.h"
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/compositor/operations/COM_ImageOperation.cpp b/source/blender/compositor/operations/COM_ImageOperation.cpp
index 353d6e8f6ce..2733c483146 100644
--- a/source/blender/compositor/operations/COM_ImageOperation.cpp
+++ b/source/blender/compositor/operations/COM_ImageOperation.cpp
@@ -28,12 +28,12 @@
 #include "BLI_math.h"
 
 extern "C" {
-	#include "RE_pipeline.h"
-	#include "RE_shader_ext.h"
-	#include "RE_render_ext.h"
-	#include "IMB_imbuf.h"
-	#include "IMB_imbuf_types.h"
-	#include "IMB_colormanagement.h"
+#  include "RE_pipeline.h"
+#  include "RE_shader_ext.h"
+#  include "RE_render_ext.h"
+#  include "IMB_imbuf.h"
+#  include "IMB_imbuf_types.h"
+#  include "IMB_colormanagement.h"
 }
 
 BaseImageOperation::BaseImageOperation() : NodeOperation()
diff --git a/source/blender/compositor/operations/COM_ImageOperation.h b/source/blender/compositor/operations/COM_ImageOperation.h
index a9e2ed9ff64..206f1509f60 100644
--- a/source/blender/compositor/operations/COM_ImageOperation.h
+++ b/source/blender/compositor/operations/COM_ImageOperation.h
@@ -28,10 +28,10 @@
 #include "BLI_listbase.h"
 #include "BKE_image.h"
 extern "C" {
-	#include "RE_pipeline.h"
-	#include "RE_shader_ext.h"
-	#include "RE_render_ext.h"
-	#include "MEM_guardedalloc.h"
+#  include "RE_pipeline.h"
+#  include "RE_shader_ext.h"
+#  include "RE_render_ext.h"
+#  include "MEM_guardedalloc.h"
 }
 
 /**
diff --git a/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp b/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
index 201dc99eb9e..0a1587c6ffa 100644
--- a/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
+++ b/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
@@ -30,11 +30,11 @@
 #include "BLI_math_color.h"
 
 extern "C" {
-	#include "BKE_movieclip.h"
-	#include "BKE_tracking.h"
+#  include "BKE_movieclip.h"
+#  include "BKE_tracking.h"
 
-	#include "IMB_imbuf.h"
-	#include "IMB_imbuf_types.h"
+#  include "IMB_imbuf.h"
+#  include "IMB_imbuf_types.h"
 }
 
 KeyingScreenOperation::KeyingScreenOperation() : NodeOperation()
diff --git a/source/blender/compositor/operations/COM_KeyingScreenOperation.h b/source/blender/compositor/operations/COM_KeyingScreenOperation.h
index fa22ba668b9..10cf48e57f4 100644
--- a/source/blender/compositor/operations/COM_KeyingScreenOperation.h
+++ b/source/blender/compositor/operations/COM_KeyingScreenOperation.h
@@ -35,7 +35,7 @@
 #include "BLI_string.h"
 
 extern "C" {
-	#include "BLI_voronoi.h"
+#  include "BLI_voronoi.h"
 }
 
 /**
diff --git a/source/blender/compositor/operations/COM_MaskOperation.cpp b/source/blender/compositor/operations/COM_MaskOperation.cpp
index a5b1987d4b3..7ee2c111932 100644
--- a/source/blender/compositor/operations/COM_MaskOperation.cpp
+++ b/source/blender/compositor/operations/COM_MaskOperation.cpp
@@ -29,7 +29,7 @@
 #include "BLI_math.h"
 
 extern "C" {
-	#include "BKE_mask.h"
+#  include "BKE_mask.h"
 }
 
 MaskOperation::MaskOperation() : NodeOperation()
diff --git a/source/blender/compositor/operations/COM_MixOperation.cpp b/source/blender/compositor/operations/COM_MixOperation.cpp
index 9781cb4e162..125de842892 100644
--- a/source/blender/compositor/operations/COM_MixOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixOperation.cpp
@@ -23,7 +23,7 @@
 #include "COM_MixOperation.h"
 
 extern "C" {
-	#include "BLI_math.h"
+#  include "BLI_math.h"
 }
 
 /* ******** Mix Base Operation ******** */
diff --git a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
index fbbfa8fd65e..447ca1bb4f6 100644
--- a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
+++ b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
@@ -22,8 +22,8 @@
 
 #include "COM_MovieClipAttributeOperation.h"
 extern "C" {
-	#include "BKE_tracking.h"
-	#include "BKE_movieclip.h"
+#  include "BKE_tracking.h"
+#  include "BKE_movieclip.h"
 }
 MovieClipAttributeOperation::MovieClipAttributeOperation() : NodeOperation()
 {
diff --git a/source/blender/compositor/operations/COM_MovieClipOperation.cpp b/source/blender/compositor/operations/COM_MovieClipOperation.cpp
index dcb5ca06662..9a184ae1216 100644
--- a/source/blender/compositor/operations/COM_MovieClipOperation.cpp
+++ b/source/blender/compositor/operations/COM_MovieClipOperation.cpp
@@ -25,8 +25,8 @@
 #include "BLI_listbase.h"
 #include "BLI_math.h"
 extern "C" {
-	#include "BKE_movieclip.h"
-	#include "IMB_imbuf.h"
+#  include "BKE_movieclip.h"
+#  include "IMB_imbuf.h"
 }
 #include "BKE_image.h"
 
diff --git a/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp b/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
index bc792244dcb..28b1fc11a7c 100644
--- a/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
+++ b/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
@@ -23,9 +23,9 @@
 #include "COM_MovieDistortionOperation.h"
 
 extern "C" {
-	#include "BKE_tracking.h"
-	#include "BKE_movieclip.h"
-	#include "BLI_linklist.h"
+#  include "BKE_tracking.h"
+#  include "BKE_movieclip.h"
+#  include "BLI_linklist.h"
 }
 
 
diff --git a/source/blender/compositor/operations/COM_MovieDistortionOperation.h b/source/blender/compositor/operations/COM_MovieDistortionOperation.h
index 42c4a84f9b2..a1dd08d8624 100644
--- a/source/blender/compositor/operations/COM_MovieDistortionOperation.h
+++ b/source/blender/compositor/operations/COM_MovieDistortionOperation.h
@@ -28,8 +28,8 @@
 #include "MEM_guardedalloc.h"
 
 extern "C" {
-	#include "BKE_tracking.h"
-	#include "PIL_time.h"
+#  include "BKE_tracking.h"
+#  include "PIL_time.h"
 }
 
 #define COM_DISTORTIONCACHE_MAXSIZE 10
diff --git a/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp b/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
index ffa319f20a8..23fba5a7999 100644
--- a/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
+++ b/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
@@ -23,8 +23,8 @@
 
 #include "COM_MultilayerImageOperation.h"
 extern "C" {
-	#include "IMB_imbuf.h"
-	#include "IMB_imbuf_types.h"
+#  include "IMB_imbuf.h"
+#  include "IMB_imbuf_types.h"
 }
 
 MultilayerBaseOperation::MultilayerBaseOperation(int passindex) : BaseImageOperation()
diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.cpp b/source/blender/compositor/operations/COM_OutputFileOperation.cpp
index c94387337c3..094b2c4268a 100644
--- a/source/blender/compositor/operations/COM_OutputFileOperation.cpp
+++ b/source/blender/compositor/operations/COM_OutputFileOperation.cpp
@@ -34,10 +34,10 @@
 #include "DNA_color_types.h"
 
 extern "C" {
-	#include "MEM_guardedalloc.h"
-	#include "IMB_imbuf.h"
-	#include "IMB_colormanagement.h"
-	#include "IMB_imbuf_types.h"
+#  include "MEM_guardedalloc.h"
+#  include "IMB_imbuf.h"
+#  include "IMB_colormanagement.h"
+#  include "IMB_imbuf_types.h"
 }
 
 static int get_datatype_size(DataType datatype)
diff --git a/source/blender/compositor/operations/COM_PlaneTrackCommonOperation.cpp b/source/blender/compositor/operations/COM_PlaneTrackCommonOperation.cpp
index 51e803f696b..5deb7b99bce 100644
--- a/source/blender/compositor/operations/COM_PlaneTrackCommonOperation.cpp
+++ b/source/blender/compositor/operations/COM_PlaneTrackCommonOperation.cpp
@@ -28,9 +28,9 @@
 #include "BLI_math_color.h"
 
 extern "C" {
-	#include "BKE_movieclip.h"
-	#include "BKE_node.h"
-	#include "BKE_tracking.h"
+#  include "BKE_movieclip.h"
+#  include "BKE_node.h"
+#  include "BKE_tracking.h"
 }
 
 PlaneTrackCommonOperation::PlaneTrackCommonOperation() : NodeOperation()
diff --git a/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp b/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp
index 58fa4bd08dc..e43f6ab05b3 100644
--- a/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp
+++ b/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp
@@ -28,11 +28,11 @@
 #include "BLI_math_color.h"
 
 extern "C" {
-	#include "BLI_jitter.h"
+#  include "BLI_jitter.h"
 
-	#include "BKE_movieclip.h"
-	#include "BKE_node.h"
-	#include "BKE_tracking.h"
+#  include "BKE_movieclip.h"
+#  include "BKE_node.h"
+#  include "BKE_tracking.h"
 }
 
 PlaneTrackMaskOperation::PlaneTrackMaskOperation() : PlaneTrackCommonOperation()
diff --git a/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp b/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp
index 7780023c465..6579276fa9f 100644
--- a/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp
+++ b/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp
@@ -29,11 +29,11 @@
 #include "BLI_math_color.h"
 
 extern "C" {
-	#include "BLI_jitter.h"
+#  include "BLI_jitter.h"
 
-	#include "BKE_movieclip.h"
-	#include "BKE_node.h"
-	#include "BKE_tracking.h"
+#  include "BKE_movieclip.h"
+#  include "BKE_node.h"
+#  include "BKE_tracking.h"
 }
 
 BLI_INLINE void warpCoord(float x, float y, float matrix[3][3], float uv[2], float deriv[2][2])
diff --git a/source/blender/compositor/operations/COM_PreviewOperation.cpp b/source/blender/compositor/operations/COM_PreviewOperation.cpp
index add9e8b959e..2ea18f64aab 100644
--- a/source/blender/compositor/operations/COM_PreviewOperation.cpp
+++ b/source/blender/compositor/operations/COM_PreviewOperation.cpp
@@ -32,11 +32,11 @@
 #include "COM_defines.h"
 #include "BLI_math.h"
 extern "C" {
-	#include "MEM_guardedalloc.h"
-	#include "IMB_imbuf.h"
-	#include "IMB_imbuf_types.h"
-	#include "IMB_colormanagement.h"
-	#include "BKE_node.h"
+#  include "MEM_guardedalloc.h"
+#  include "IMB_imbuf.h"
+#  include "IMB_imbuf_types.h"
+#  include "IMB_colormanagement.h"
+#  include "BKE_node.h"
 }
 
 
diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.cpp b/source/blender/compositor/operations/COM_RenderLayersProg.cpp
index f72af2780d7..e7cda208319 100644
--- a/source/blender/compositor/operations/COM_RenderLayersProg.cpp
+++ b/source/blender/compositor/operations/COM_RenderLayersProg.cpp
@@ -26,9 +26,9 @@
 #include "DNA_scene_types.h"
 
 extern "C" {
-	#include "RE_pipeline.h"
-	#include "RE_shader_ext.h"
-	#include "RE_render_ext.h"
+#  include "RE_pipeline.h"
+#  include "RE_shader_ext.h"
+#  include "RE_render_ext.h"
 }
 
 /* ******** Render Layers Base Prog ******** */
diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.h b/source/blender/compositor/operations/COM_RenderLayersProg.h
index b76a8621b19..554e27eb579 100644
--- a/source/blender/compositor/operations/COM_RenderLayersProg.h
+++ b/source/blender/compositor/operations/COM_RenderLayersProg.h
@@ -29,10 +29,10 @@
 #include "BLI_listbase.h"
 #include "BKE_image.h"
 extern "C" {
-	#include "RE_pipeline.h"
-	#include "RE_shader_ext.h"
-	#include "RE_render_ext.h"
-	#include "MEM_guardedalloc.h"
+#  include "RE_pipeline.h"
+#  include "RE_shader_ext.h"
+#  include "RE_render_ext.h"
+#  include "MEM_guardedalloc.h"
 }
 
 /**
diff --git a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
index 5d2977d361b..29c104d0b55 100644
--- a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
+++ b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
@@ -23,9 +23,9 @@
 #include "COM_ScreenLensDistortionOperation.h"
 
 extern "C" {
-	#include "BLI_math.h"
-	#include "BLI_utildefines.h"
-	#include "BLI_rand.h"
+#  include "BLI_math.h"
+#  include "BLI_utildefines.h"
+#  include "BLI_rand.h"
 }
 
 ScreenLensDistortionOperation::ScreenLensDistortionOperation() : NodeOperation()
diff --git a/source/blender/compositor/operations/COM_SplitOperation.cpp b/source/blender/compositor/operations/COM_SplitOperation.cpp
index 210095f3bf1..9278f1c3ec4 100644
--- a/source/blender/compositor/operations/COM_SplitOperation.cpp
+++ b/source/blender/compositor/operations/COM_SplitOperation.cpp
@@ -29,9 +29,9 @@
 #include "BLI_math_vector.h"
 
 extern "C" {
-	#include "MEM_guardedalloc.h"
-	#include "IMB_imbuf.h"
-	#include "IMB_imbuf_types.h"
+#  include "MEM_guardedalloc.h"
+#  include "IMB_imbuf.h"
+#  include "IMB_imbuf_types.h"
 }
 
 
diff --git a/source/blender/compositor/operations/COM_TextureOperation.h b/source/blender/compositor/operations/COM_TextureOperation.h
index 064e63c025a..114cee00530 100644
--- a/source/blender/compositor/operations/COM_TextureOperation.h
+++ b/source/blender/compositor/operations/COM_TextureOperation.h
@@ -28,10 +28,10 @@
 #include "DNA_texture_types.h"
 #include "BLI_listbase.h"
 extern "C" {
-	#include "RE_pipeline.h"
-	#include "RE_shader_ext.h"
-	#include "RE_render_ext.h"
-	#include "MEM_guardedalloc.h"
+#  include "RE_pipeline.h"
+#  include "RE_shader_ext.h"
+#  include "RE_render_ext.h"
+#  include "MEM_guardedalloc.h"
 }
 
 /**
diff --git a/source/blender/compositor/operations/COM_TrackPositionOperation.cpp b/source/blender/compositor/operations/COM_TrackPositionOperation.cpp
index 721b17bcff0..a76e0866d0d 100644
--- a/source/blender/compositor/operations/COM_TrackPositionOperation.cpp
+++ b/source/blender/compositor/operations/COM_TrackPositionOperation.cpp
@@ -30,9 +30,9 @@
 #include "BLI_math_color.h"
 
 extern "C" {
-	#include "BKE_movieclip.h"
-	#include "BKE_node.h"
-	#include "BKE_tracking.h"
+#  include "BKE_movieclip.h"
+#  include "BKE_node.h"
+#  include "BKE_tracking.h"
 }
 
 TrackPositionOperation::TrackPositionOperation() : NodeOperation()
diff --git a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
index 8bdaa0f486e..4b81001fdab 100644
--- a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
@@ -25,7 +25,7 @@
 #include "COM_OpenCLDevice.h"
 
 extern "C" {
-	#include "RE_pipeline.h"
+#  include "RE_pipeline.h"
 }
 
 VariableSizeBokehBlurOperation::VariableSizeBokehBlurOperation() : NodeOperation()
diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.cpp b/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
index 08ef1249a6a..f5890157440 100644
--- a/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
@@ -27,7 +27,7 @@
 
 // use the implementation of blender internal renderer to calculate the vector blur.
 extern "C" {
-	#include "RE_pipeline.h"
+#  include "RE_pipeline.h"
 }
 
 VectorBlurOperation::VectorBlurOperation() : NodeOperation()
diff --git a/source/blender/compositor/operations/COM_VectorCurveOperation.cpp b/source/blender/compositor/operations/COM_VectorCurveOperation.cpp
index 204b0f2011b..fedc8c6db7d 100644
--- a/source/blender/compositor/operations/COM_VectorCurveOperation.cpp
+++ b/source/blender/compositor/operations/COM_VectorCurveOperation.cpp
@@ -25,7 +25,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-	#include "BKE_colortools.h"
+#  include "BKE_colortools.h"
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/compositor/operations/COM_ViewerOperation.cpp b/source/blender/compositor/operations/COM_ViewerOperation.cpp
index 8997f7bb436..aa0806944db 100644
--- a/source/blender/compositor/operations/COM_ViewerOperation.cpp
+++ b/source/blender/compositor/operations/COM_ViewerOperation.cpp
@@ -32,10 +32,10 @@
 #include "BLI_math_vector.h"
 
 extern "C" {
-	#include "MEM_guardedalloc.h"
-	#include "IMB_imbuf.h"
-	#include "IMB_imbuf_types.h"
-	#include "IMB_colormanagement.h"
+#  include "MEM_guardedalloc.h"
+#  include "IMB_imbuf.h"
+#  include "IMB_imbuf_types.h"
+#  include "IMB_colormanagement.h"
 }