ClangFormat: apply to source, most of intern

Apply clang format as proposed in T53211.

For details on usage and instructions for migrating branches
without conflicts, see:

https://wiki.blender.org/wiki/Tools/ClangFormat

1 files changed, 70 insertions, 67 deletions

diff --git a/source/blender/compositor/nodes/COM_ZCombineNode.cpp b/source/blender/compositor/nodes/COM_ZCombineNode.cpp
index 00b86c0f1e0..4faf828d6df 100644
--- a/source/blender/compositor/nodes/COM_ZCombineNode.cpp
+++ b/source/blender/compositor/nodes/COM_ZCombineNode.cpp
@@ -26,73 +26,76 @@
 #include "COM_AntiAliasOperation.h"
 #include "COM_MixOperation.h"
 
-#include "DNA_material_types.h" // the ramp types
+#include "DNA_material_types.h"  // the ramp types
 
-void ZCombineNode::convertToOperations(NodeConverter &converter, const CompositorContext &context) const
+void ZCombineNode::convertToOperations(NodeConverter &converter,
+                                       const CompositorContext &context) const
 {
-	if ((context.getRenderData()->scemode & R_FULL_SAMPLE) || this->getbNode()->custom2) {
-		ZCombineOperation *operation = NULL;
-		if (this->getbNode()->custom1) {
-			operation = new ZCombineAlphaOperation();
-		}
-		else {
-			operation = new ZCombineOperation();
-		}
-		converter.addOperation(operation);
-
-		converter.mapInputSocket(getInputSocket(0), operation->getInputSocket(0));
-		converter.mapInputSocket(getInputSocket(1), operation->getInputSocket(1));
-		converter.mapInputSocket(getInputSocket(2), operation->getInputSocket(2));
-		converter.mapInputSocket(getInputSocket(3), operation->getInputSocket(3));
-		converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket());
-
-		MathMinimumOperation *zoperation = new MathMinimumOperation();
-		converter.addOperation(zoperation);
-
-		converter.mapInputSocket(getInputSocket(1), zoperation->getInputSocket(0));
-		converter.mapInputSocket(getInputSocket(3), zoperation->getInputSocket(1));
-		converter.mapOutputSocket(getOutputSocket(1), zoperation->getOutputSocket());
-	}
-	else {
-		/* XXX custom1 is "use_alpha", what on earth is this supposed to do here?!? */
-		// not full anti alias, use masking for Z combine. be aware it uses anti aliasing.
-		// step 1 create mask
-		NodeOperation *maskoperation;
-		if (this->getbNode()->custom1) {
-			maskoperation = new MathGreaterThanOperation();
-			converter.addOperation(maskoperation);
-
-			converter.mapInputSocket(getInputSocket(1), maskoperation->getInputSocket(0));
-			converter.mapInputSocket(getInputSocket(3), maskoperation->getInputSocket(1));
-		}
-		else {
-			maskoperation = new MathLessThanOperation();
-			converter.addOperation(maskoperation);
-
-			converter.mapInputSocket(getInputSocket(1), maskoperation->getInputSocket(0));
-			converter.mapInputSocket(getInputSocket(3), maskoperation->getInputSocket(1));
-		}
-
-		// step 2 anti alias mask bit of an expensive operation, but does the trick
-		AntiAliasOperation *antialiasoperation = new AntiAliasOperation();
-		converter.addOperation(antialiasoperation);
-
-		converter.addLink(maskoperation->getOutputSocket(), antialiasoperation->getInputSocket(0));
-
-		// use mask to blend between the input colors.
-		ZCombineMaskOperation *zcombineoperation = this->getbNode()->custom1 ? new ZCombineMaskAlphaOperation() : new ZCombineMaskOperation();
-		converter.addOperation(zcombineoperation);
-
-		converter.addLink(antialiasoperation->getOutputSocket(), zcombineoperation->getInputSocket(0));
-		converter.mapInputSocket(getInputSocket(0), zcombineoperation->getInputSocket(1));
-		converter.mapInputSocket(getInputSocket(2), zcombineoperation->getInputSocket(2));
-		converter.mapOutputSocket(getOutputSocket(0), zcombineoperation->getOutputSocket());
-
-		MathMinimumOperation *zoperation = new MathMinimumOperation();
-		converter.addOperation(zoperation);
-
-		converter.mapInputSocket(getInputSocket(1), zoperation->getInputSocket(0));
-		converter.mapInputSocket(getInputSocket(3), zoperation->getInputSocket(1));
-		converter.mapOutputSocket(getOutputSocket(1), zoperation->getOutputSocket());
-	}
+  if ((context.getRenderData()->scemode & R_FULL_SAMPLE) || this->getbNode()->custom2) {
+    ZCombineOperation *operation = NULL;
+    if (this->getbNode()->custom1) {
+      operation = new ZCombineAlphaOperation();
+    }
+    else {
+      operation = new ZCombineOperation();
+    }
+    converter.addOperation(operation);
+
+    converter.mapInputSocket(getInputSocket(0), operation->getInputSocket(0));
+    converter.mapInputSocket(getInputSocket(1), operation->getInputSocket(1));
+    converter.mapInputSocket(getInputSocket(2), operation->getInputSocket(2));
+    converter.mapInputSocket(getInputSocket(3), operation->getInputSocket(3));
+    converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket());
+
+    MathMinimumOperation *zoperation = new MathMinimumOperation();
+    converter.addOperation(zoperation);
+
+    converter.mapInputSocket(getInputSocket(1), zoperation->getInputSocket(0));
+    converter.mapInputSocket(getInputSocket(3), zoperation->getInputSocket(1));
+    converter.mapOutputSocket(getOutputSocket(1), zoperation->getOutputSocket());
+  }
+  else {
+    /* XXX custom1 is "use_alpha", what on earth is this supposed to do here?!? */
+    // not full anti alias, use masking for Z combine. be aware it uses anti aliasing.
+    // step 1 create mask
+    NodeOperation *maskoperation;
+    if (this->getbNode()->custom1) {
+      maskoperation = new MathGreaterThanOperation();
+      converter.addOperation(maskoperation);
+
+      converter.mapInputSocket(getInputSocket(1), maskoperation->getInputSocket(0));
+      converter.mapInputSocket(getInputSocket(3), maskoperation->getInputSocket(1));
+    }
+    else {
+      maskoperation = new MathLessThanOperation();
+      converter.addOperation(maskoperation);
+
+      converter.mapInputSocket(getInputSocket(1), maskoperation->getInputSocket(0));
+      converter.mapInputSocket(getInputSocket(3), maskoperation->getInputSocket(1));
+    }
+
+    // step 2 anti alias mask bit of an expensive operation, but does the trick
+    AntiAliasOperation *antialiasoperation = new AntiAliasOperation();
+    converter.addOperation(antialiasoperation);
+
+    converter.addLink(maskoperation->getOutputSocket(), antialiasoperation->getInputSocket(0));
+
+    // use mask to blend between the input colors.
+    ZCombineMaskOperation *zcombineoperation = this->getbNode()->custom1 ?
+                                                   new ZCombineMaskAlphaOperation() :
+                                                   new ZCombineMaskOperation();
+    converter.addOperation(zcombineoperation);
+
+    converter.addLink(antialiasoperation->getOutputSocket(), zcombineoperation->getInputSocket(0));
+    converter.mapInputSocket(getInputSocket(0), zcombineoperation->getInputSocket(1));
+    converter.mapInputSocket(getInputSocket(2), zcombineoperation->getInputSocket(2));
+    converter.mapOutputSocket(getOutputSocket(0), zcombineoperation->getOutputSocket());
+
+    MathMinimumOperation *zoperation = new MathMinimumOperation();
+    converter.addOperation(zoperation);
+
+    converter.mapInputSocket(getInputSocket(1), zoperation->getInputSocket(0));
+    converter.mapInputSocket(getInputSocket(3), zoperation->getInputSocket(1));
+    converter.mapOutputSocket(getOutputSocket(1), zoperation->getOutputSocket());
+  }
 }