style cleanup: more nodes

110 files changed, 593 insertions, 474 deletions

diff --git a/source/blender/compositor/intern/COM_NodeBase.cpp b/source/blender/compositor/intern/COM_NodeBase.cpp
index 5ffe9bdd26a..42946d7315e 100644
--- a/source/blender/compositor/intern/COM_NodeBase.cpp
+++ b/source/blender/compositor/intern/COM_NodeBase.cpp
@@ -31,6 +31,7 @@
 
 NodeBase::NodeBase()
 {
+	/* pass */
 }
 
 
diff --git a/source/blender/compositor/intern/COM_NodeOperation.cpp b/source/blender/compositor/intern/COM_NodeOperation.cpp
index 1c05c2a3ae8..114d9f44cef 100644
--- a/source/blender/compositor/intern/COM_NodeOperation.cpp
+++ b/source/blender/compositor/intern/COM_NodeOperation.cpp
@@ -69,6 +69,7 @@ void NodeOperation::setResolutionInputSocketIndex(unsigned int index)
 }
 void NodeOperation::initExecution()
 {
+	/* pass */
 }
 
 void NodeOperation::initMutex()
@@ -93,6 +94,7 @@ void NodeOperation::deinitMutex()
 
 void NodeOperation::deinitExecution()
 {
+	/* pass */
 }
 SocketReader *NodeOperation::getInputSocketReader(unsigned int inputSocketIndex)
 {
diff --git a/source/blender/compositor/intern/COM_OutputSocket.cpp b/source/blender/compositor/intern/COM_OutputSocket.cpp
index da08b512003..484254fe6de 100644
--- a/source/blender/compositor/intern/COM_OutputSocket.cpp
+++ b/source/blender/compositor/intern/COM_OutputSocket.cpp
@@ -27,6 +27,7 @@
 
 OutputSocket::OutputSocket(DataType datatype) : Socket(datatype)
 {
+	/* pass */
 }
 
 int OutputSocket::isOutputSocket() const { return true; }
diff --git a/source/blender/compositor/nodes/COM_AlphaOverNode.cpp b/source/blender/compositor/nodes/COM_AlphaOverNode.cpp
index eb3cd821172..4f3ed36aadb 100644
--- a/source/blender/compositor/nodes/COM_AlphaOverNode.cpp
+++ b/source/blender/compositor/nodes/COM_AlphaOverNode.cpp
@@ -31,7 +31,7 @@
 #include "COM_SetValueOperation.h"
 #include "DNA_material_types.h" // the ramp types
 
-void AlphaOverNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void AlphaOverNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *valueSocket = this->getInputSocket(0);
 	InputSocket *color1Socket = this->getInputSocket(1);
@@ -40,8 +40,8 @@ void AlphaOverNode::convertToOperations(ExecutionSystem *graph, CompositorContex
 	bNode *editorNode = this->getbNode();
 	
 	MixBaseOperation *convertProg;
-	NodeTwoFloats *ntf = (NodeTwoFloats*)editorNode->storage;
-	if (ntf->x!= 0.0f) {
+	NodeTwoFloats *ntf = (NodeTwoFloats *)editorNode->storage;
+	if (ntf->x != 0.0f) {
 		AlphaOverMixedOperation *mixOperation  = new AlphaOverMixedOperation();
 		mixOperation->setX(ntf->x);
 		convertProg = mixOperation;
diff --git a/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp b/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
index 6baa04ff7c2..f96a92068f4 100644
--- a/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
+++ b/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
@@ -28,6 +28,7 @@
 
 BilateralBlurNode::BilateralBlurNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
 void BilateralBlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
diff --git a/source/blender/compositor/nodes/COM_BlurNode.cpp b/source/blender/compositor/nodes/COM_BlurNode.cpp
index fe93768161c..1b541d81c33 100644
--- a/source/blender/compositor/nodes/COM_BlurNode.cpp
+++ b/source/blender/compositor/nodes/COM_BlurNode.cpp
@@ -31,6 +31,7 @@
 
 BlurNode::BlurNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
 void BlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
diff --git a/source/blender/compositor/nodes/COM_BokehBlurNode.cpp b/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
index ee0119230f4..296056b6c48 100644
--- a/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
+++ b/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
@@ -32,6 +32,7 @@
 
 BokehBlurNode::BokehBlurNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
 void BokehBlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
diff --git a/source/blender/compositor/nodes/COM_BokehImageNode.cpp b/source/blender/compositor/nodes/COM_BokehImageNode.cpp
index f498fa11e30..75f5e07d552 100644
--- a/source/blender/compositor/nodes/COM_BokehImageNode.cpp
+++ b/source/blender/compositor/nodes/COM_BokehImageNode.cpp
@@ -25,15 +25,16 @@
 #include "COM_BokehImageOperation.h"
 #include "COM_ExecutionSystem.h"
 
-BokehImageNode::BokehImageNode(bNode *editorNode): Node(editorNode)
+BokehImageNode::BokehImageNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void BokehImageNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void BokehImageNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	BokehImageOperation *operation = new BokehImageOperation();
 	this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
 	graph->addOperation(operation);
-	operation->setData((NodeBokehImage*)this->getbNode()->storage);
+	operation->setData((NodeBokehImage *)this->getbNode()->storage);
 	addPreviewOperation(graph, operation->getOutputSocket(0));
 }
diff --git a/source/blender/compositor/nodes/COM_BoxMaskNode.cpp b/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
index e99252663d0..789ff265a5c 100644
--- a/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
+++ b/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
@@ -25,15 +25,16 @@
 #include "COM_BoxMaskOperation.h"
 #include "COM_ExecutionSystem.h"
 
-BoxMaskNode::BoxMaskNode(bNode *editorNode): Node(editorNode)
+BoxMaskNode::BoxMaskNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void BoxMaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void BoxMaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	BoxMaskOperation *operation;
 	operation = new BoxMaskOperation();
-	operation->setData((NodeBoxMask*)this->getbNode()->storage);
+	operation->setData((NodeBoxMask *)this->getbNode()->storage);
 	this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
 	this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph);
 	this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
diff --git a/source/blender/compositor/nodes/COM_BrightnessNode.cpp b/source/blender/compositor/nodes/COM_BrightnessNode.cpp
index 9ccb58a45de..1e1fbdbc301 100644
--- a/source/blender/compositor/nodes/COM_BrightnessNode.cpp
+++ b/source/blender/compositor/nodes/COM_BrightnessNode.cpp
@@ -25,11 +25,12 @@
 #include "COM_BrightnessOperation.h"
 #include "COM_ExecutionSystem.h"
 
-BrightnessNode::BrightnessNode(bNode *editorNode): Node(editorNode)
+BrightnessNode::BrightnessNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void BrightnessNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void BrightnessNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	BrightnessOperation *operation = new BrightnessOperation();
 	this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
diff --git a/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp b/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
index f1d5b8d39cc..69f39639660 100644
--- a/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
+++ b/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
@@ -27,8 +27,10 @@
 #include "COM_ConvertRGBToYUVOperation.h"
 #include "COM_SetAlphaOperation.h"
 
-ChannelMatteNode::ChannelMatteNode(bNode *editorNode): Node(editorNode)
-{}
+ChannelMatteNode::ChannelMatteNode(bNode *editorNode) : Node(editorNode)
+{
+	/* pass */
+}
 
 void ChannelMatteNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
@@ -36,30 +38,30 @@ void ChannelMatteNode::convertToOperations(ExecutionSystem *graph, CompositorCon
 	OutputSocket *outputSocketImage = this->getOutputSocket(0);
 	OutputSocket *outputSocketMatte = this->getOutputSocket(1);
 
-	NodeOperation *convert=NULL;
+	NodeOperation *convert = NULL;
 	bNode *node = this->getbNode();
 
 	/* colorspace */
 	switch (node->custom1) {
-	case CMP_NODE_CHANNEL_MATTE_CS_RGB:
-		break;
-	case CMP_NODE_CHANNEL_MATTE_CS_HSV: /*HSV*/
-		convert = new ConvertRGBToHSVOperation();
-		break;
-	case CMP_NODE_CHANNEL_MATTE_CS_YUV: /*YUV*/
-		convert = new ConvertRGBToYUVOperation();
-		break;
-	case CMP_NODE_CHANNEL_MATTE_CS_YCC: /*YCC*/
-		convert = new ConvertRGBToYCCOperation();
-		((ConvertRGBToYCCOperation *)convert)->setMode(0); /* BLI_YCC_ITU_BT601 */
-		break;
-	default:
-		break;
+		case CMP_NODE_CHANNEL_MATTE_CS_RGB:
+			break;
+		case CMP_NODE_CHANNEL_MATTE_CS_HSV: /*HSV*/
+			convert = new ConvertRGBToHSVOperation();
+			break;
+		case CMP_NODE_CHANNEL_MATTE_CS_YUV: /*YUV*/
+			convert = new ConvertRGBToYUVOperation();
+			break;
+		case CMP_NODE_CHANNEL_MATTE_CS_YCC: /*YCC*/
+			convert = new ConvertRGBToYCCOperation();
+			((ConvertRGBToYCCOperation *)convert)->setMode(0); /* BLI_YCC_ITU_BT601 */
+			break;
+		default:
+			break;
 	}
 
 	ChannelMatteOperation *operation = new ChannelMatteOperation();
 	/* pass the ui properties to the operation */
-	operation->setSettings((NodeChroma*)node->storage, node->custom2);
+	operation->setSettings((NodeChroma *)node->storage, node->custom2);
 
 	SetAlphaOperation *operationAlpha = new SetAlphaOperation();
 
diff --git a/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp b/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
index 82059ed8493..0fb09157351 100644
--- a/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
+++ b/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
@@ -25,8 +25,10 @@
 #include "COM_ConvertRGBToYCCOperation.h"
 #include "COM_SetAlphaOperation.h"
 
-ChromaMatteNode::ChromaMatteNode(bNode *editorNode): Node(editorNode)
-{}
+ChromaMatteNode::ChromaMatteNode(bNode *editorNode) : Node(editorNode)
+{
+	/* pass */
+}
 
 void ChromaMatteNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
@@ -42,7 +44,7 @@ void ChromaMatteNode::convertToOperations(ExecutionSystem *graph, CompositorCont
 
 	ChromaMatteOperation *operation = new ChromaMatteOperation();
 	bNode *editorsnode = getbNode();
-	operation->setSettings((NodeChroma*)editorsnode->storage);
+	operation->setSettings((NodeChroma *)editorsnode->storage);
 
 	inputSocketImage->relinkConnections(operationRGBToYCC_Image->getInputSocket(0), 0, graph);
 	inputSocketKey->relinkConnections(operationRGBToYCC_Key->getInputSocket(0), 0, graph);
diff --git a/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp b/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
index 7b852678191..d85b1ec1de1 100644
--- a/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
+++ b/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
@@ -27,10 +27,12 @@
 #include "BKE_node.h"
 #include "COM_MixBlendOperation.h"
 
-ColorBalanceNode::ColorBalanceNode(bNode *editorNode): Node(editorNode)
+ColorBalanceNode::ColorBalanceNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
-void ColorBalanceNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+
+void ColorBalanceNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *inputSocket = this->getInputSocket(0);
 	InputSocket *inputImageSocket = this->getInputSocket(1);
@@ -38,16 +40,16 @@ void ColorBalanceNode::convertToOperations(ExecutionSystem *graph, CompositorCon
 	
 	bNode *node = this->getbNode();
 	NodeColorBalance *n = (NodeColorBalance *)node->storage;
-	NodeOperation*operation;
+	NodeOperation *operation;
 	if (node->custom1 == 0) {
 		ColorBalanceLGGOperation *operationLGG = new ColorBalanceLGGOperation();
 		{
-				int c;
+			int c;
 	
-				for (c = 0; c < 3; c++) {
-						n->lift_lgg[c] = 2.0f - n->lift[c];
-						n->gamma_inv[c] = (n->gamma[c] != 0.0f) ? 1.0f/n->gamma[c] : 1000000.0f;
-				}
+			for (c = 0; c < 3; c++) {
+				n->lift_lgg[c] = 2.0f - n->lift[c];
+				n->gamma_inv[c] = (n->gamma[c] != 0.0f) ? 1.0f / n->gamma[c] : 1000000.0f;
+			}
 		}
 	
 		operationLGG->setGain(n->gain);
diff --git a/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp b/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp
index 4909f1b9895..41b3bebbd7b 100644
--- a/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp
+++ b/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp
@@ -25,20 +25,21 @@
 #include "COM_ColorCorrectionOperation.h"
 #include "COM_ExecutionSystem.h"
 
-ColorCorrectionNode::ColorCorrectionNode(bNode *editorNode): Node(editorNode)
+ColorCorrectionNode::ColorCorrectionNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void ColorCorrectionNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void ColorCorrectionNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	ColorCorrectionOperation *operation = new ColorCorrectionOperation();
 	bNode *editorNode = getbNode();
 	this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
 	this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph);
 	this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
-	operation->setData((NodeColorCorrection*)editorNode->storage);
-	operation->setRedChannelEnabled((editorNode->custom1&1)>0);
-	operation->setGreenChannelEnabled((editorNode->custom1&2)>0);
-	operation->setBlueChannelEnabled((editorNode->custom1&4)>0);
+	operation->setData((NodeColorCorrection *)editorNode->storage);
+	operation->setRedChannelEnabled((editorNode->custom1 & 1) > 0);
+	operation->setGreenChannelEnabled((editorNode->custom1 & 2) > 0);
+	operation->setBlueChannelEnabled((editorNode->custom1 & 4) > 0);
 	graph->addOperation(operation);
 }
diff --git a/source/blender/compositor/nodes/COM_ColorCurveNode.cpp b/source/blender/compositor/nodes/COM_ColorCurveNode.cpp
index 0d331ed9b05..9ae11c22b6a 100644
--- a/source/blender/compositor/nodes/COM_ColorCurveNode.cpp
+++ b/source/blender/compositor/nodes/COM_ColorCurveNode.cpp
@@ -25,11 +25,12 @@
 #include "COM_ColorCurveOperation.h"
 #include "COM_ExecutionSystem.h"
 
-ColorCurveNode::ColorCurveNode(bNode *editorNode): Node(editorNode)
+ColorCurveNode::ColorCurveNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void ColorCurveNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void ColorCurveNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	if (this->getInputSocket(2)->isConnected() || this->getInputSocket(3)->isConnected()) {
 		ColorCurveOperation *operation = new ColorCurveOperation();
@@ -41,21 +42,22 @@ void ColorCurveNode::convertToOperations(ExecutionSystem *graph, CompositorConte
 	
 		this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket());
 	
-		operation->setCurveMapping((CurveMapping*)this->getbNode()->storage);
+		operation->setCurveMapping((CurveMapping *)this->getbNode()->storage);
 	
 		graph->addOperation(operation);
-	} else {
+	}
+	else {
 		ConstantLevelColorCurveOperation *operation = new ConstantLevelColorCurveOperation();
 	
 		this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
 		this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph);
-		bNodeSocketValueRGBA *val = (bNodeSocketValueRGBA*)this->getInputSocket(2)->getbNodeSocket()->default_value;
+		bNodeSocketValueRGBA *val = (bNodeSocketValueRGBA *)this->getInputSocket(2)->getbNodeSocket()->default_value;
 		operation->setBlackLevel(val->value);
-		val = (bNodeSocketValueRGBA*)this->getInputSocket(3)->getbNodeSocket()->default_value;
+		val = (bNodeSocketValueRGBA *)this->getInputSocket(3)->getbNodeSocket()->default_value;
 		operation->setWhiteLevel(val->value);
 		this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket());
 	
-		operation->setCurveMapping((CurveMapping*)this->getbNode()->storage);
+		operation->setCurveMapping((CurveMapping *)this->getbNode()->storage);
 	
 		graph->addOperation(operation);
 	}
diff --git a/source/blender/compositor/nodes/COM_ColorMatteNode.cpp b/source/blender/compositor/nodes/COM_ColorMatteNode.cpp
index ad117e1ca2c..38ab6ba8da2 100644
--- a/source/blender/compositor/nodes/COM_ColorMatteNode.cpp
+++ b/source/blender/compositor/nodes/COM_ColorMatteNode.cpp
@@ -25,8 +25,10 @@
 #include "COM_ConvertRGBToHSVOperation.h"
 #include "COM_SetAlphaOperation.h"
 
-ColorMatteNode::ColorMatteNode(bNode *editorNode): Node(editorNode)
-{}
+ColorMatteNode::ColorMatteNode(bNode *editorNode) : Node(editorNode)
+{
+	/* pass */
+}
 
 void ColorMatteNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
@@ -40,7 +42,7 @@ void ColorMatteNode::convertToOperations(ExecutionSystem *graph, CompositorConte
 
 	ColorMatteOperation *operation = new ColorMatteOperation();
 	bNode *editorsnode = getbNode();
-	operation->setSettings((NodeChroma*)editorsnode->storage);
+	operation->setSettings((NodeChroma *)editorsnode->storage);
 
 	inputSocketImage->relinkConnections(operationRGBToHSV_Image->getInputSocket(0), 0, graph);
 	inputSocketKey->relinkConnections(operationRGBToHSV_Key->getInputSocket(0), 1, graph);
diff --git a/source/blender/compositor/nodes/COM_ColorNode.cpp b/source/blender/compositor/nodes/COM_ColorNode.cpp
index f5fcb0177f7..65480c7aeb2 100644
--- a/source/blender/compositor/nodes/COM_ColorNode.cpp
+++ b/source/blender/compositor/nodes/COM_ColorNode.cpp
@@ -25,15 +25,16 @@
 #include "COM_SetColorOperation.h"
 #include "COM_ExecutionSystem.h"
 
-ColorNode::ColorNode(bNode *editorNode): Node(editorNode)
+ColorNode::ColorNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void ColorNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void ColorNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	SetColorOperation *operation = new SetColorOperation();
 	bNodeSocket *socket = this->getEditorOutputSocket(0);
-	bNodeSocketValueRGBA *dval = (bNodeSocketValueRGBA*)socket->default_value;
+	bNodeSocketValueRGBA *dval = (bNodeSocketValueRGBA *)socket->default_value;
 	this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket());
 	operation->setChannels(dval->value);
 	graph->addOperation(operation);
diff --git a/source/blender/compositor/nodes/COM_ColorRampNode.cpp b/source/blender/compositor/nodes/COM_ColorRampNode.cpp
index c6090120467..a79c7885ae4 100644
--- a/source/blender/compositor/nodes/COM_ColorRampNode.cpp
+++ b/source/blender/compositor/nodes/COM_ColorRampNode.cpp
@@ -27,10 +27,12 @@
 #include "COM_SeparateChannelOperation.h"
 #include "DNA_texture_types.h"
 
-ColorRampNode::ColorRampNode(bNode *editorNode): Node(editorNode)
-{}
+ColorRampNode::ColorRampNode(bNode *editorNode) : Node(editorNode)
+{
+	/* pass */
+}
 
-void ColorRampNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void ColorRampNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *inputSocket = this->getInputSocket(0);
 	OutputSocket *outputSocket = this->getOutputSocket(0);
@@ -46,7 +48,7 @@ void ColorRampNode::convertToOperations(ExecutionSystem *graph, CompositorContex
 		operation2->setChannel(3);
 		graph->addOperation(operation2);
 	}
-	operation->setColorBand((ColorBand*)editorNode->storage);
+	operation->setColorBand((ColorBand *)editorNode->storage);
 	inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);
 	graph->addOperation(operation);
 }
diff --git a/source/blender/compositor/nodes/COM_ColorSpillNode.cpp b/source/blender/compositor/nodes/COM_ColorSpillNode.cpp
index 503ca3c8bd3..0e586955ff8 100644
--- a/source/blender/compositor/nodes/COM_ColorSpillNode.cpp
+++ b/source/blender/compositor/nodes/COM_ColorSpillNode.cpp
@@ -24,8 +24,10 @@
 #include "BKE_node.h"
 #include "COM_ColorSpillOperation.h"
 
-ColorSpillNode::ColorSpillNode(bNode *editorNode): Node(editorNode)
-{}
+ColorSpillNode::ColorSpillNode(bNode *editorNode) : Node(editorNode)
+{
+	/* pass */
+}
 
 void ColorSpillNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
@@ -45,8 +47,8 @@ void ColorSpillNode::convertToOperations(ExecutionSystem *graph, CompositorConte
 		// Average color spill
 		operation = new ColorSpillAverageOperation();
 	}
-	operation->setSettings((NodeColorspill*)editorsnode->storage);
-	operation->setSpillChannel(editorsnode->custom1-1); // Channel for spilling
+	operation->setSettings((NodeColorspill *)editorsnode->storage);
+	operation->setSpillChannel(editorsnode->custom1 - 1); // Channel for spilling
 	
 
 	inputSocketImage->relinkConnections(operation->getInputSocket(0), 0, graph);
diff --git a/source/blender/compositor/nodes/COM_ColorToBWNode.cpp b/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
index ed2869d35f2..430f317eae2 100644
--- a/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
+++ b/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
@@ -25,11 +25,12 @@
 #include "COM_ConvertColorToBWOperation.h"
 #include "COM_ExecutionSystem.h"
 
-ColourToBWNode::ColourToBWNode(bNode *editorNode): Node(editorNode)
+ColourToBWNode::ColourToBWNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void ColourToBWNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void ColourToBWNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *colourSocket = this->getInputSocket(0);
 	OutputSocket *valueSocket = this->getOutputSocket(0);
diff --git a/source/blender/compositor/nodes/COM_CombineHSVANode.cpp b/source/blender/compositor/nodes/COM_CombineHSVANode.cpp
index a0f46ad6b6c..beba41fade9 100644
--- a/source/blender/compositor/nodes/COM_CombineHSVANode.cpp
+++ b/source/blender/compositor/nodes/COM_CombineHSVANode.cpp
@@ -28,11 +28,12 @@
 #include "COM_SetValueOperation.h"
 #include "COM_ConvertHSVToRGBOperation.h"
 
-CombineHSVANode::CombineHSVANode(bNode *editorNode): CombineRGBANode(editorNode)
+CombineHSVANode::CombineHSVANode(bNode *editorNode) : CombineRGBANode(editorNode)
 {
+	/* pass */
 }
 
-void CombineHSVANode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void CombineHSVANode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	ConvertHSVToRGBOperation *operation = new ConvertHSVToRGBOperation();
 	OutputSocket *outputSocket = this->getOutputSocket(0);
diff --git a/source/blender/compositor/nodes/COM_CombineRGBANode.cpp b/source/blender/compositor/nodes/COM_CombineRGBANode.cpp
index e6fcc48ac5b..a8cdd8c2950 100644
--- a/source/blender/compositor/nodes/COM_CombineRGBANode.cpp
+++ b/source/blender/compositor/nodes/COM_CombineRGBANode.cpp
@@ -29,12 +29,12 @@
 #include "DNA_material_types.h" // the ramp types
 
 
-CombineRGBANode::CombineRGBANode(bNode *editorNode): Node(editorNode)
+CombineRGBANode::CombineRGBANode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-
-void CombineRGBANode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void CombineRGBANode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *inputRSocket = this->getInputSocket(0);
 	InputSocket *inputGSocket = this->getInputSocket(1);
diff --git a/source/blender/compositor/nodes/COM_CombineYCCANode.cpp b/source/blender/compositor/nodes/COM_CombineYCCANode.cpp
index ad6203ea85a..5319eb84184 100644
--- a/source/blender/compositor/nodes/COM_CombineYCCANode.cpp
+++ b/source/blender/compositor/nodes/COM_CombineYCCANode.cpp
@@ -22,8 +22,9 @@
 #include "COM_CombineYCCANode.h"
 #include "COM_ConvertYCCToRGBOperation.h"
 
-CombineYCCANode::CombineYCCANode(bNode *editorNode): CombineRGBANode(editorNode)
+CombineYCCANode::CombineYCCANode(bNode *editorNode) : CombineRGBANode(editorNode)
 {
+	/* pass */
 }
 
 void CombineYCCANode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
diff --git a/source/blender/compositor/nodes/COM_CombineYUVANode.cpp b/source/blender/compositor/nodes/COM_CombineYUVANode.cpp
index ea92a40f803..48c2c6ca649 100644
--- a/source/blender/compositor/nodes/COM_CombineYUVANode.cpp
+++ b/source/blender/compositor/nodes/COM_CombineYUVANode.cpp
@@ -22,8 +22,9 @@
 #include "COM_CombineYUVANode.h"
 #include "COM_ConvertYUVToRGBOperation.h"
 
-CombineYUVANode::CombineYUVANode(bNode *editorNode): CombineRGBANode(editorNode)
+CombineYUVANode::CombineYUVANode(bNode *editorNode) : CombineRGBANode(editorNode)
 {
+	/* pass */
 }
 
 void CombineYUVANode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
diff --git a/source/blender/compositor/nodes/COM_CompositorNode.cpp b/source/blender/compositor/nodes/COM_CompositorNode.cpp
index e2cc34bb6ce..fccb92ddd8b 100644
--- a/source/blender/compositor/nodes/COM_CompositorNode.cpp
+++ b/source/blender/compositor/nodes/COM_CompositorNode.cpp
@@ -24,11 +24,12 @@
 #include "COM_CompositorOperation.h"
 #include "COM_ExecutionSystem.h"
 
-CompositorNode::CompositorNode(bNode *editorNode): Node(editorNode)
+CompositorNode::CompositorNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void CompositorNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void CompositorNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *imageSocket = this->getInputSocket(0);
 	InputSocket *alphaSocket = this->getInputSocket(1);
diff --git a/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp b/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
index 0b4326a17ca..70aeee8fc27 100644
--- a/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
+++ b/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
@@ -24,7 +24,7 @@
 #include "COM_ConvertKeyToPremulOperation.h"
 #include "COM_ExecutionSystem.h"
 
-void ConvertAlphaNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void ConvertAlphaNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	NodeOperation *operation = NULL;
 	bNode *node = this->getbNode();
diff --git a/source/blender/compositor/nodes/COM_CropNode.cpp b/source/blender/compositor/nodes/COM_CropNode.cpp
index c58fcc874cb..b80a3e088f2 100644
--- a/source/blender/compositor/nodes/COM_CropNode.cpp
+++ b/source/blender/compositor/nodes/COM_CropNode.cpp
@@ -26,12 +26,13 @@
 
 CropNode::CropNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void CropNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void CropNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	bNode *node = getbNode();
-	NodeTwoXYs *cropSettings = (NodeTwoXYs*)node->storage;
+	NodeTwoXYs *cropSettings = (NodeTwoXYs *)node->storage;
 	bool relative = (bool)node->custom2;
 	bool cropImage = (bool)node->custom1;
 	CropBaseOperation *operation;
diff --git a/source/blender/compositor/nodes/COM_DefocusNode.cpp b/source/blender/compositor/nodes/COM_DefocusNode.cpp
index e4e19fdbe27..d1f90b490ad 100644
--- a/source/blender/compositor/nodes/COM_DefocusNode.cpp
+++ b/source/blender/compositor/nodes/COM_DefocusNode.cpp
@@ -33,16 +33,17 @@
 #include "COM_SetValueOperation.h"
 #include "COM_GammaCorrectOperation.h"
 
-DefocusNode::DefocusNode(bNode *editorNode): Node(editorNode)
+DefocusNode::DefocusNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void DefocusNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void DefocusNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	bNode *node = this->getbNode();
-	Scene *scene = (Scene*)node->id;
-	Object *camob = (scene)? scene->camera: NULL;
-	NodeDefocus *data = (NodeDefocus*)node->storage;
+	Scene *scene = (Scene *)node->id;
+	Object *camob = (scene) ? scene->camera : NULL;
+	NodeDefocus *data = (NodeDefocus *)node->storage;
 
 	NodeOperation *radiusOperation;
 	if (data->no_zbuf) {
@@ -74,11 +75,11 @@ void DefocusNode::convertToOperations(ExecutionSystem *graph, CompositorContext
 	}
 	
 	BokehImageOperation *bokeh = new BokehImageOperation();
-	NodeBokehImage * bokehdata = new NodeBokehImage();
+	NodeBokehImage *bokehdata = new NodeBokehImage();
 	bokehdata->angle = data->rotation;
 	bokehdata->rounding = 0.0f;
 	bokehdata->flaps = data->bktype;
-	if (data->bktype<3) {
+	if (data->bktype < 3) {
 		bokehdata->flaps = 5;
 		bokehdata->rounding = 1.0f;
 	}
@@ -96,8 +97,8 @@ void DefocusNode::convertToOperations(ExecutionSystem *graph, CompositorContext
 	addLink(graph, bokeh->getOutputSocket(), operation->getInputSocket(1));
 	addLink(graph, radiusOperation->getOutputSocket(), operation->getInputSocket(2));
 	if (data->gamco) {
-		GammaCorrectOperation * correct = new GammaCorrectOperation();
-		GammaUncorrectOperation * inverse = new GammaUncorrectOperation();
+		GammaCorrectOperation *correct = new GammaCorrectOperation();
+		GammaUncorrectOperation *inverse = new GammaUncorrectOperation();
 		this->getInputSocket(0)->relinkConnections(correct->getInputSocket(0), 0, graph);
 		addLink(graph, correct->getOutputSocket(), operation->getInputSocket(0));
 		addLink(graph, operation->getOutputSocket(), inverse->getInputSocket(0));
diff --git a/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp b/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp
index 596fefff77c..6dca049a6ae 100644
--- a/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp
+++ b/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp
@@ -25,10 +25,12 @@
 #include "COM_DifferenceMatteOperation.h"
 #include "COM_SetAlphaOperation.h"
 
-DifferenceMatteNode::DifferenceMatteNode(bNode *editorNode): Node(editorNode)
-{}
+DifferenceMatteNode::DifferenceMatteNode(bNode *editorNode) : Node(editorNode)
+{
+	/* pass */
+}
 
-void DifferenceMatteNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void DifferenceMatteNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *inputSocket = this->getInputSocket(0);
 	InputSocket *inputSocket2 = this->getInputSocket(1);
@@ -36,15 +38,15 @@ void DifferenceMatteNode::convertToOperations(ExecutionSystem *graph, Compositor
 	OutputSocket *outputSocketMatte = this->getOutputSocket(1);
 	bNode *editorNode = this->getbNode();
 
-	DifferenceMatteOperation * operationSet = new DifferenceMatteOperation();
-	operationSet->setSettings((NodeChroma*)editorNode->storage);
+	DifferenceMatteOperation *operationSet = new DifferenceMatteOperation();
+	operationSet->setSettings((NodeChroma *)editorNode->storage);
 	inputSocket->relinkConnections(operationSet->getInputSocket(0), 0, graph);
 	inputSocket2->relinkConnections(operationSet->getInputSocket(1), 1, graph);
 
 	outputSocketMatte->relinkConnections(operationSet->getOutputSocket(0));
 	graph->addOperation(operationSet);
 
-	SetAlphaOperation * operation = new SetAlphaOperation();
+	SetAlphaOperation *operation = new SetAlphaOperation();
 	addLink(graph, operationSet->getInputSocket(0)->getConnection()->getFromSocket(), operation->getInputSocket(0));
 	addLink(graph, operationSet->getOutputSocket(), operation->getInputSocket(1));
 	outputSocketImage->relinkConnections(operation->getOutputSocket());
diff --git a/source/blender/compositor/nodes/COM_DilateErodeNode.cpp b/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
index fe9e97a3e4b..6ee5b2a2b0d 100644
--- a/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
+++ b/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
@@ -29,6 +29,7 @@
 
 DilateErodeNode::DilateErodeNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
 void DilateErodeNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
diff --git a/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp b/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
index d096ef977f8..dee0e6a88da 100644
--- a/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
+++ b/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
@@ -28,6 +28,7 @@
 
 DirectionalBlurNode::DirectionalBlurNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
 void DirectionalBlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
diff --git a/source/blender/compositor/nodes/COM_DisplaceNode.cpp b/source/blender/compositor/nodes/COM_DisplaceNode.cpp
index 9604db378bc..41fbfd61981 100644
--- a/source/blender/compositor/nodes/COM_DisplaceNode.cpp
+++ b/source/blender/compositor/nodes/COM_DisplaceNode.cpp
@@ -24,11 +24,12 @@
 #include "COM_DisplaceSimpleOperation.h"
 #include "COM_ExecutionSystem.h"
 
-DisplaceNode::DisplaceNode(bNode *editorNode): Node(editorNode)
+DisplaceNode::DisplaceNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void DisplaceNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void DisplaceNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	NodeOperation *operation;
 	if (context->getQuality() == COM_QUALITY_LOW)
diff --git a/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp b/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
index 20a55ae195c..d6730ef6a00 100644
--- a/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
+++ b/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
@@ -24,8 +24,10 @@
 #include "COM_DistanceMatteOperation.h"
 #include "COM_SetAlphaOperation.h"
 
-DistanceMatteNode::DistanceMatteNode(bNode *editorNode): Node(editorNode)
-{}
+DistanceMatteNode::DistanceMatteNode(bNode *editorNode) : Node(editorNode)
+{
+	/* pass */
+}
 
 void DistanceMatteNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
@@ -36,7 +38,7 @@ void DistanceMatteNode::convertToOperations(ExecutionSystem *graph, CompositorCo
 
 	DistanceMatteOperation *operation = new DistanceMatteOperation();
 	bNode *editorsnode = getbNode();
-	operation->setSettings((NodeChroma*)editorsnode->storage);
+	operation->setSettings((NodeChroma *)editorsnode->storage);
 
 	inputSocketImage->relinkConnections(operation->getInputSocket(0), 0, graph);
 	inputSocketKey->relinkConnections(operation->getInputSocket(1), 1, graph);
diff --git a/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp b/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp
index ab9e101dad8..57c319e7630 100644
--- a/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp
+++ b/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp
@@ -25,11 +25,12 @@
 #include "DNA_scene_types.h"
 #include "COM_ExecutionSystem.h"
 
-DoubleEdgeMaskNode::DoubleEdgeMaskNode(bNode *editorNode): Node(editorNode)
+DoubleEdgeMaskNode::DoubleEdgeMaskNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void DoubleEdgeMaskNode::convertToOperations(ExecutionSystem *system, CompositorContext * context)
+void DoubleEdgeMaskNode::convertToOperations(ExecutionSystem *system, CompositorContext *context)
 {
 	DoubleEdgeMaskOperation *operation;
 	bNode *bnode = this->getbNode();
diff --git a/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp b/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp
index f5003c4be94..23410c6a115 100644
--- a/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp
+++ b/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp
@@ -25,15 +25,16 @@
 #include "COM_EllipseMaskOperation.h"
 #include "COM_ExecutionSystem.h"
 
-EllipseMaskNode::EllipseMaskNode(bNode *editorNode): Node(editorNode)
+EllipseMaskNode::EllipseMaskNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void EllipseMaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void EllipseMaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	EllipseMaskOperation *operation;
 	operation = new EllipseMaskOperation();
-	operation->setData((NodeEllipseMask*)this->getbNode()->storage);
+	operation->setData((NodeEllipseMask *)this->getbNode()->storage);
 	this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
 	this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph);
 	this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
diff --git a/source/blender/compositor/nodes/COM_FilterNode.cpp b/source/blender/compositor/nodes/COM_FilterNode.cpp
index 7700bceb4ab..23f87805821 100644
--- a/source/blender/compositor/nodes/COM_FilterNode.cpp
+++ b/source/blender/compositor/nodes/COM_FilterNode.cpp
@@ -27,11 +27,12 @@
 #include "BKE_node.h"
 #include "COM_MixBlendOperation.h"
 
-FilterNode::FilterNode(bNode *editorNode): Node(editorNode)
+FilterNode::FilterNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void FilterNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void FilterNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *inputSocket = this->getInputSocket(0);
 	InputSocket *inputImageSocket = this->getInputSocket(1);
@@ -39,38 +40,38 @@ void FilterNode::convertToOperations(ExecutionSystem *graph, CompositorContext *
 	ConvolutionFilterOperation *operation = NULL;
 	
 	switch (this->getbNode()->custom1) {
-	case CMP_FILT_SOFT:
-		operation = new ConvolutionFilterOperation();
-		operation->set3x3Filter(1/16.0f, 2/16.0f, 1/16.0f, 2/16.0f, 4/16.0f, 2/16.0f, 1/16.0f, 2/16.0f, 1/16.0f);
-		break;
-	case CMP_FILT_SHARP:
-		operation = new ConvolutionFilterOperation();
-		operation->set3x3Filter(-1,-1,-1,-1,9,-1,-1,-1,-1);
-		break;
-	case CMP_FILT_LAPLACE:
-		operation = new ConvolutionFilterOperation();
-		operation->set3x3Filter(-1/8.0f, -1/8.0f, -1/8.0f, -1/8.0f, 1.0f, -1/8.0f, -1/8.0f, -1/8.0f, -1/8.0f);
-		break;
-	case CMP_FILT_SOBEL:
-		operation = new ConvolutionEdgeFilterOperation();
-		operation->set3x3Filter(1,2,1,0,0,0,-1,-2,-1);
-		break;
-	case CMP_FILT_PREWITT:
-		operation = new ConvolutionEdgeFilterOperation();
-		operation->set3x3Filter(1,1,1,0,0,0,-1,-1,-1);
-		break;
-	case CMP_FILT_KIRSCH:
-		operation = new ConvolutionEdgeFilterOperation();
-		operation->set3x3Filter(5,5,5,-3,-3,-3,-2,-2,-2);
-		break;
-	case CMP_FILT_SHADOW:
-		operation = new ConvolutionFilterOperation();
-		operation->set3x3Filter(1,2,1,0,1,0,-1,-2,-1);
-		break;
-	default:
-		operation = new ConvolutionFilterOperation();
-		operation->set3x3Filter(0,0,0,0,1,0,0,0,0);
-		break;
+		case CMP_FILT_SOFT:
+			operation = new ConvolutionFilterOperation();
+			operation->set3x3Filter(1 / 16.0f, 2 / 16.0f, 1 / 16.0f, 2 / 16.0f, 4 / 16.0f, 2 / 16.0f, 1 / 16.0f, 2 / 16.0f, 1 / 16.0f);
+			break;
+		case CMP_FILT_SHARP:
+			operation = new ConvolutionFilterOperation();
+			operation->set3x3Filter(-1, -1, -1, -1, 9, -1, -1, -1, -1);
+			break;
+		case CMP_FILT_LAPLACE:
+			operation = new ConvolutionFilterOperation();
+			operation->set3x3Filter(-1 / 8.0f, -1 / 8.0f, -1 / 8.0f, -1 / 8.0f, 1.0f, -1 / 8.0f, -1 / 8.0f, -1 / 8.0f, -1 / 8.0f);
+			break;
+		case CMP_FILT_SOBEL:
+			operation = new ConvolutionEdgeFilterOperation();
+			operation->set3x3Filter(1, 2, 1, 0, 0, 0, -1, -2, -1);
+			break;
+		case CMP_FILT_PREWITT:
+			operation = new ConvolutionEdgeFilterOperation();
+			operation->set3x3Filter(1, 1, 1, 0, 0, 0, -1, -1, -1);
+			break;
+		case CMP_FILT_KIRSCH:
+			operation = new ConvolutionEdgeFilterOperation();
+			operation->set3x3Filter(5, 5, 5, -3, -3, -3, -2, -2, -2);
+			break;
+		case CMP_FILT_SHADOW:
+			operation = new ConvolutionFilterOperation();
+			operation->set3x3Filter(1, 2, 1, 0, 1, 0, -1, -2, -1);
+			break;
+		default:
+			operation = new ConvolutionFilterOperation();
+			operation->set3x3Filter(0, 0, 0, 0, 1, 0, 0, 0, 0);
+			break;
 	}
 	
 	inputImageSocket->relinkConnections(operation->getInputSocket(0), 1, graph);
diff --git a/source/blender/compositor/nodes/COM_FlipNode.cpp b/source/blender/compositor/nodes/COM_FlipNode.cpp
index 0830c757833..a50297aae1a 100644
--- a/source/blender/compositor/nodes/COM_FlipNode.cpp
+++ b/source/blender/compositor/nodes/COM_FlipNode.cpp
@@ -27,26 +27,27 @@
 
 FlipNode::FlipNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void FlipNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void FlipNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *inputSocket = this->getInputSocket(0);
 	OutputSocket *outputSocket = this->getOutputSocket(0);
 	FlipOperation *operation = new FlipOperation();
 	switch (this->getbNode()->custom1) {
-	case 0: /// @TODO: I didn't find any constants in the old implementation, should I introduce them.
-		operation->setFlipX(true);
-		operation->setFlipY(false);
-		break;
-	case 1:
-		operation->setFlipX(false);
-		operation->setFlipY(true);
-		break;
-	case 2:
-		operation->setFlipX(true);
-		operation->setFlipY(true);
-		break;
+		case 0: /// @TODO: I didn't find any constants in the old implementation, should I introduce them.
+			operation->setFlipX(true);
+			operation->setFlipY(false);
+			break;
+		case 1:
+			operation->setFlipX(false);
+			operation->setFlipY(true);
+			break;
+		case 2:
+			operation->setFlipX(true);
+			operation->setFlipY(true);
+			break;
 	}
 	
 	inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);
diff --git a/source/blender/compositor/nodes/COM_GammaNode.cpp b/source/blender/compositor/nodes/COM_GammaNode.cpp
index 58b05607618..52699c83bf9 100644
--- a/source/blender/compositor/nodes/COM_GammaNode.cpp
+++ b/source/blender/compositor/nodes/COM_GammaNode.cpp
@@ -25,11 +25,12 @@
 #include "COM_GammaOperation.h"
 #include "COM_ExecutionSystem.h"
 
-GammaNode::GammaNode(bNode *editorNode): Node(editorNode)
+GammaNode::GammaNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void GammaNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void GammaNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	GammaOperation *operation = new GammaOperation();
 	
diff --git a/source/blender/compositor/nodes/COM_GlareNode.cpp b/source/blender/compositor/nodes/COM_GlareNode.cpp
index dcb8f3a3a4c..7b34fa4d286 100644
--- a/source/blender/compositor/nodes/COM_GlareNode.cpp
+++ b/source/blender/compositor/nodes/COM_GlareNode.cpp
@@ -31,36 +31,37 @@
 #include "COM_GlareGhostOperation.h"
 #include "COM_GlareFogGlowOperation.h"
 
-GlareNode::GlareNode(bNode *editorNode): Node(editorNode)
+GlareNode::GlareNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void GlareNode::convertToOperations(ExecutionSystem *system, CompositorContext * context)\
-{
+void GlareNode::convertToOperations(ExecutionSystem *system, CompositorContext *context) \
+	{
 	bNode *node = this->getbNode();
-	NodeGlare *glare = (NodeGlare*)node->storage;
+	NodeGlare *glare = (NodeGlare *)node->storage;
 	
-	GlareBaseOperation * glareoperation = NULL;
+	GlareBaseOperation *glareoperation = NULL;
 	
 	switch (glare->type) {
 	
-	default:
-	case 3:
-		glareoperation = new GlareGhostOperation();
-		break;
-	case 2: // streaks
-		glareoperation = new GlareStreaksOperation();
-		break;
-	case 1: // fog glow
-		glareoperation = new GlareFogGlowOperation();
-		break;
-	case 0: // simple star
-		glareoperation = new GlareSimpleStarOperation();
-		break;
+		default:
+		case 3:
+			glareoperation = new GlareGhostOperation();
+			break;
+		case 2: // streaks
+			glareoperation = new GlareStreaksOperation();
+			break;
+		case 1: // fog glow
+			glareoperation = new GlareFogGlowOperation();
+			break;
+		case 0: // simple star
+			glareoperation = new GlareSimpleStarOperation();
+			break;
 	}
 	GlareThresholdOperation *thresholdOperation = new GlareThresholdOperation();
-	SetValueOperation * mixvalueoperation = new SetValueOperation();
-	MixGlareOperation * mixoperation = new MixGlareOperation();
+	SetValueOperation *mixvalueoperation = new SetValueOperation();
+	MixGlareOperation *mixoperation = new MixGlareOperation();
 	mixoperation->getInputSocket(2)->setResizeMode(COM_SC_FIT);
 
 	this->getInputSocket(0)->relinkConnections(thresholdOperation->getInputSocket(0), 0, system);
@@ -72,7 +73,7 @@ void GlareNode::convertToOperations(ExecutionSystem *system, CompositorContext *
 
 	thresholdOperation->setGlareSettings(glare);
 	glareoperation->setGlareSettings(glare);
-	mixvalueoperation->setValue(0.5f+glare->mix*0.5f);
+	mixvalueoperation->setValue(0.5f + glare->mix * 0.5f);
 	mixoperation->setResolutionInputSocketIndex(1);
 
 	system->addOperation(glareoperation);
@@ -80,4 +81,4 @@ void GlareNode::convertToOperations(ExecutionSystem *system, CompositorContext *
 	system->addOperation(mixvalueoperation);
 	system->addOperation(mixoperation);
 	
-}
+	}
diff --git a/source/blender/compositor/nodes/COM_GroupNode.cpp b/source/blender/compositor/nodes/COM_GroupNode.cpp
index 8a8c1db86b4..e5255b6bb87 100644
--- a/source/blender/compositor/nodes/COM_GroupNode.cpp
+++ b/source/blender/compositor/nodes/COM_GroupNode.cpp
@@ -24,44 +24,46 @@
 #include "COM_SocketProxyNode.h"
 #include "COM_ExecutionSystemHelper.h"
 
-GroupNode::GroupNode(bNode *editorNode): Node(editorNode)
+GroupNode::GroupNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void GroupNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void GroupNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
+	/* pass */
 }
 
 void GroupNode::ungroup(ExecutionSystem &system)
 {
-	bNode * bnode = this->getbNode();
-	vector<InputSocket*> &inputsockets = this->getInputSockets();
-	vector<OutputSocket*> &outputsockets = this->getOutputSockets();
+	bNode *bnode = this->getbNode();
+	vector<InputSocket *> &inputsockets = this->getInputSockets();
+	vector<OutputSocket *> &outputsockets = this->getOutputSockets();
 	unsigned int index;
 
 	/* get the node list size _before_ adding proxy nodes, so they are available for linking */
 	int nodes_start = system.getNodes().size();
 
-	for (index = 0 ; index < inputsockets.size();index ++) {
-		InputSocket * inputSocket = inputsockets[index];
+	for (index = 0; index < inputsockets.size(); index++) {
+		InputSocket *inputSocket = inputsockets[index];
 		bNodeSocket *editorInput = inputSocket->getbNodeSocket();
 		if (editorInput->groupsock) {
-			SocketProxyNode * proxy = new SocketProxyNode(bnode, editorInput, editorInput->groupsock);
+			SocketProxyNode *proxy = new SocketProxyNode(bnode, editorInput, editorInput->groupsock);
 			inputSocket->relinkConnections(proxy->getInputSocket(0), index, &system);
 			ExecutionSystemHelper::addNode(system.getNodes(), proxy);
 		}
 	}
 
-	for (index = 0 ; index < outputsockets.size();index ++) {
-		OutputSocket * outputSocket = outputsockets[index];
+	for (index = 0; index < outputsockets.size(); index++) {
+		OutputSocket *outputSocket = outputsockets[index];
 		bNodeSocket *editorOutput = outputSocket->getbNodeSocket();
 		if (editorOutput->groupsock) {
-			SocketProxyNode * proxy = new SocketProxyNode(bnode, editorOutput->groupsock, editorOutput);
+			SocketProxyNode *proxy = new SocketProxyNode(bnode, editorOutput->groupsock, editorOutput);
 			outputSocket->relinkConnections(proxy->getOutputSocket(0));
 			ExecutionSystemHelper::addNode(system.getNodes(), proxy);
 		}
 	}
 
-	bNodeTree *subtree = (bNodeTree*)bnode->id;
+	bNodeTree *subtree = (bNodeTree *)bnode->id;
 	ExecutionSystemHelper::addbNodeTree(system, nodes_start, subtree, bnode);
 }
diff --git a/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp b/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
index ae96a8c9fb8..6057a7f0e6c 100644
--- a/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
+++ b/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
@@ -33,23 +33,24 @@
 #include "DNA_node_types.h"
 #include "COM_HueSaturationValueCorrectOperation.h"
 
-HueSaturationValueCorrectNode::HueSaturationValueCorrectNode(bNode *editorNode): Node(editorNode)
+HueSaturationValueCorrectNode::HueSaturationValueCorrectNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void HueSaturationValueCorrectNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void HueSaturationValueCorrectNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *valueSocket = this->getInputSocket(0);
 	InputSocket *colourSocket = this->getInputSocket(1);
 	OutputSocket *outputSocket = this->getOutputSocket(0);
 	bNode *editorsnode = getbNode();
-	CurveMapping *storage = (CurveMapping*)editorsnode->storage;
+	CurveMapping *storage = (CurveMapping *)editorsnode->storage;
 	
 	if (colourSocket->isConnected() && outputSocket->isConnected()) {
-		ConvertRGBToHSVOperation * rgbToHSV = new ConvertRGBToHSVOperation();
-		ConvertHSVToRGBOperation * hsvToRGB = new ConvertHSVToRGBOperation();
+		ConvertRGBToHSVOperation *rgbToHSV = new ConvertRGBToHSVOperation();
+		ConvertHSVToRGBOperation *hsvToRGB = new ConvertHSVToRGBOperation();
 		HueSaturationValueCorrectOperation *changeHSV = new HueSaturationValueCorrectOperation();
-		MixBlendOperation * blend = new MixBlendOperation();
+		MixBlendOperation *blend = new MixBlendOperation();
 	
 		colourSocket->relinkConnections(rgbToHSV->getInputSocket(0), 1, graph);
 		addLink(graph, rgbToHSV->getOutputSocket(), changeHSV->getInputSocket(0));
diff --git a/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp b/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
index 32c7d4719a4..ef501317e48 100644
--- a/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
+++ b/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
@@ -32,22 +32,23 @@
 #include "COM_ChangeHSVOperation.h"
 #include "DNA_node_types.h"
 
-HueSaturationValueNode::HueSaturationValueNode(bNode *editorNode): Node(editorNode)
+HueSaturationValueNode::HueSaturationValueNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void HueSaturationValueNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void HueSaturationValueNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *valueSocket = this->getInputSocket(0);
 	InputSocket *colourSocket = this->getInputSocket(1);
 	OutputSocket *outputSocket = this->getOutputSocket(0);
 	bNode *editorsnode = getbNode();
-	NodeHueSat *storage = (NodeHueSat*)editorsnode->storage;
+	NodeHueSat *storage = (NodeHueSat *)editorsnode->storage;
 
-	ConvertRGBToHSVOperation * rgbToHSV = new ConvertRGBToHSVOperation();
-	ConvertHSVToRGBOperation * hsvToRGB = new ConvertHSVToRGBOperation();
+	ConvertRGBToHSVOperation *rgbToHSV = new ConvertRGBToHSVOperation();
+	ConvertHSVToRGBOperation *hsvToRGB = new ConvertHSVToRGBOperation();
 	ChangeHSVOperation *changeHSV = new ChangeHSVOperation();
-	MixBlendOperation * blend = new MixBlendOperation();
+	MixBlendOperation *blend = new MixBlendOperation();
 
 	colourSocket->relinkConnections(rgbToHSV->getInputSocket(0), 0, graph);
 	addLink(graph, rgbToHSV->getOutputSocket(), changeHSV->getInputSocket(0));
diff --git a/source/blender/compositor/nodes/COM_IDMaskNode.cpp b/source/blender/compositor/nodes/COM_IDMaskNode.cpp
index 82d3ae8ca29..4005e5d2900 100644
--- a/source/blender/compositor/nodes/COM_IDMaskNode.cpp
+++ b/source/blender/compositor/nodes/COM_IDMaskNode.cpp
@@ -26,10 +26,11 @@
 #include "COM_ExecutionSystem.h"
 #include "COM_AntiAliasOperation.h"
 
-IDMaskNode::IDMaskNode(bNode *editorNode): Node(editorNode)
+IDMaskNode::IDMaskNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
-void IDMaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void IDMaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	bNode *bnode = this->getbNode();
 	IDMaskOperation *operation;
@@ -37,11 +38,11 @@ void IDMaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext *
 	operation->setObjectIndex(bnode->custom1);
 	
 	this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
-	if (bnode->custom2==0 || context->getScene()->r.scemode & R_FULL_SAMPLE) {
+	if (bnode->custom2 == 0 || context->getScene()->r.scemode & R_FULL_SAMPLE) {
 		this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
 	}
 	else {
-		AntiAliasOperation * antiAliasOperation = new AntiAliasOperation();
+		AntiAliasOperation *antiAliasOperation = new AntiAliasOperation();
 		addLink(graph, operation->getOutputSocket(), antiAliasOperation->getInputSocket(0));
 		this->getOutputSocket(0)->relinkConnections(antiAliasOperation->getOutputSocket(0));
 		graph->addOperation(antiAliasOperation);
diff --git a/source/blender/compositor/nodes/COM_ImageNode.cpp b/source/blender/compositor/nodes/COM_ImageNode.cpp
index cfd530173a9..addde140b9f 100644
--- a/source/blender/compositor/nodes/COM_ImageNode.cpp
+++ b/source/blender/compositor/nodes/COM_ImageNode.cpp
@@ -28,25 +28,27 @@
 #include "BKE_node.h"
 #include "BLI_utildefines.h"
 
-ImageNode::ImageNode(bNode *editorNode): Node(editorNode)
+ImageNode::ImageNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
+
 }
 NodeOperation *ImageNode::doMultilayerCheck(ExecutionSystem *system, RenderLayer *rl, Image *image, ImageUser *user, int framenumber, int outputsocketIndex, int pass, DataType datatype)
 {
 	OutputSocket *outputSocket = this->getOutputSocket(outputsocketIndex);
-	MultilayerBaseOperation * operation = NULL;
+	MultilayerBaseOperation *operation = NULL;
 	switch (datatype) {
-	case COM_DT_VALUE:
-		operation = new MultilayerValueOperation(pass);
-		break;
-	case COM_DT_VECTOR:
-		operation = new MultilayerVectorOperation(pass);
-		break;
-	case COM_DT_COLOR:
-		operation = new MultilayerColorOperation(pass);
-		break;
-	default:
-		break;
+		case COM_DT_VALUE:
+			operation = new MultilayerValueOperation(pass);
+			break;
+		case COM_DT_VECTOR:
+			operation = new MultilayerVectorOperation(pass);
+			break;
+		case COM_DT_COLOR:
+			operation = new MultilayerColorOperation(pass);
+			break;
+		default:
+			break;
 	}
 	operation->setImage(image);
 	operation->setRenderLayer(rl);
@@ -57,52 +59,52 @@ NodeOperation *ImageNode::doMultilayerCheck(ExecutionSystem *system, RenderLayer
 	return operation;
 }
 
-void ImageNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void ImageNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	/// Image output
 	OutputSocket *outputImage = this->getOutputSocket(0);
 	bNode *editorNode = this->getbNode();
-	Image *image = (Image*)editorNode->id;
-	ImageUser *imageuser = (ImageUser*)editorNode->storage;
+	Image *image = (Image *)editorNode->id;
+	ImageUser *imageuser = (ImageUser *)editorNode->storage;
 	int framenumber = context->getFramenumber();
 	int numberOfOutputs = this->getNumberOfOutputSockets();
 	BKE_image_user_frame_calc(imageuser, context->getFramenumber(), 0);
 
 	/* force a load, we assume iuser index will be set OK anyway */
-	if (image && image->type==IMA_TYPE_MULTILAYER) {
+	if (image && image->type == IMA_TYPE_MULTILAYER) {
 		BKE_image_get_ibuf(image, imageuser);
 		if (image->rr) {
-			RenderLayer *rl = (RenderLayer*)BLI_findlink(&image->rr->layers, imageuser->layer);
+			RenderLayer *rl = (RenderLayer *)BLI_findlink(&image->rr->layers, imageuser->layer);
 			if (rl) {
-				OutputSocket * socket;
+				OutputSocket *socket;
 				int index;
-				for (index = 0 ; index < numberOfOutputs ; index ++) {
+				for (index = 0; index < numberOfOutputs; index++) {
 					socket = this->getOutputSocket(index);
 					if (socket->isConnected() || index == 0) {
 						bNodeSocket *bnodeSocket = socket->getbNodeSocket();
-						NodeImageLayer *storage = (NodeImageLayer*)bnodeSocket->storage;
+						NodeImageLayer *storage = (NodeImageLayer *)bnodeSocket->storage;
 						int passindex = storage->pass_index;
 						
 						RenderPass *rpass = (RenderPass *)BLI_findlink(&rl->passes, passindex);
 						if (rpass) {
-							NodeOperation * operation = NULL;
+							NodeOperation *operation = NULL;
 							imageuser->pass = passindex;
 							switch (rpass->channels) {
-							case 1:
-								operation = doMultilayerCheck(graph, rl, image, imageuser, framenumber, index, passindex, COM_DT_VALUE);
-								break;
-							/* using image operations for both 3 and 4 channels (RGB and RGBA respectively) */
-							/* XXX any way to detect actual vector images? */
-							case 3:
-								operation = doMultilayerCheck(graph, rl, image, imageuser, framenumber, index, passindex, COM_DT_VECTOR);
-								break;
-							case 4:
-								operation = doMultilayerCheck(graph, rl, image, imageuser, framenumber, index, passindex, COM_DT_COLOR);
-								break;
-							
-							default:
-							/* XXX add a dummy operation? */
-							break;
+								case 1:
+									operation = doMultilayerCheck(graph, rl, image, imageuser, framenumber, index, passindex, COM_DT_VALUE);
+									break;
+								/* using image operations for both 3 and 4 channels (RGB and RGBA respectively) */
+								/* XXX any way to detect actual vector images? */
+								case 3:
+									operation = doMultilayerCheck(graph, rl, image, imageuser, framenumber, index, passindex, COM_DT_VECTOR);
+									break;
+								case 4:
+									operation = doMultilayerCheck(graph, rl, image, imageuser, framenumber, index, passindex, COM_DT_COLOR);
+									break;
+
+								default:
+									/* XXX add a dummy operation? */
+									break;
 							}
 							if (index == 0 && operation) {
 								addPreviewOperation(graph, operation->getOutputSocket());
diff --git a/source/blender/compositor/nodes/COM_InvertNode.cpp b/source/blender/compositor/nodes/COM_InvertNode.cpp
index 5d039239fbe..c468bda1b67 100644
--- a/source/blender/compositor/nodes/COM_InvertNode.cpp
+++ b/source/blender/compositor/nodes/COM_InvertNode.cpp
@@ -26,11 +26,12 @@
 #include "COM_ExecutionSystem.h"
 #include "BKE_node.h"
 
-InvertNode::InvertNode(bNode *editorNode): Node(editorNode)
+InvertNode::InvertNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void InvertNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void InvertNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InvertOperation *operation = new InvertOperation();
 	bNode *node = this->getbNode();
diff --git a/source/blender/compositor/nodes/COM_KeyingNode.cpp b/source/blender/compositor/nodes/COM_KeyingNode.cpp
index 75a2fe96646..50c1903982e 100644
--- a/source/blender/compositor/nodes/COM_KeyingNode.cpp
+++ b/source/blender/compositor/nodes/COM_KeyingNode.cpp
@@ -41,8 +41,9 @@
 
 #include "COM_SetAlphaOperation.h"
 
-KeyingNode::KeyingNode(bNode *editorNode): Node(editorNode)
+KeyingNode::KeyingNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
 OutputSocket *KeyingNode::setupPreBlur(ExecutionSystem *graph, InputSocket *inputImage, int size, OutputSocket **originalImage)
@@ -189,7 +190,7 @@ void KeyingNode::convertToOperations(ExecutionSystem *graph, CompositorContext *
 
 	postprocessedMatte = keyingOperation->getOutputSocket();
 
-	if (keying_data->clip_black > 0.0f || keying_data->clip_white< 1.0f) {
+	if (keying_data->clip_black > 0.0f || keying_data->clip_white < 1.0f) {
 		postprocessedMatte = setupClip(graph, postprocessedMatte,
 		                               keying_data->edge_kernel_radius, keying_data->edge_kernel_tolerance,
 		                               keying_data->clip_black, keying_data->clip_white, false);
diff --git a/source/blender/compositor/nodes/COM_KeyingScreenNode.cpp b/source/blender/compositor/nodes/COM_KeyingScreenNode.cpp
index ad58adae48b..0fb8d45d066 100644
--- a/source/blender/compositor/nodes/COM_KeyingScreenNode.cpp
+++ b/source/blender/compositor/nodes/COM_KeyingScreenNode.cpp
@@ -29,11 +29,12 @@ extern "C" {
 	#include "DNA_movieclip_types.h"
 }
 
-KeyingScreenNode::KeyingScreenNode(bNode *editorNode): Node(editorNode)
+KeyingScreenNode::KeyingScreenNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void KeyingScreenNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void KeyingScreenNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	OutputSocket *outputScreen = this->getOutputSocket(0);
 
diff --git a/source/blender/compositor/nodes/COM_LensDistortionNode.cpp b/source/blender/compositor/nodes/COM_LensDistortionNode.cpp
index e55dd5e64d8..03034e34eb7 100644
--- a/source/blender/compositor/nodes/COM_LensDistortionNode.cpp
+++ b/source/blender/compositor/nodes/COM_LensDistortionNode.cpp
@@ -26,14 +26,15 @@
 #include "COM_ProjectorLensDistortionOperation.h"
 #include "COM_ScreenLensDistortionOperation.h"
 
-LensDistortionNode::LensDistortionNode(bNode *editorNode): Node(editorNode)
+LensDistortionNode::LensDistortionNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void LensDistortionNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void LensDistortionNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	bNode *editorNode = this->getbNode();
-	NodeLensDist * data = (NodeLensDist*)editorNode->storage;
+	NodeLensDist *data = (NodeLensDist *)editorNode->storage;
 	if (data->proj) {
 		ProjectorLensDistortionOperation *operation = new ProjectorLensDistortionOperation();
 
diff --git a/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp b/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
index 37976216106..be949e2cacb 100644
--- a/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
+++ b/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
@@ -25,8 +25,10 @@
 #include "COM_ConvertRGBToYUVOperation.h"
 #include "COM_SetAlphaOperation.h"
 
-LuminanceMatteNode::LuminanceMatteNode(bNode *editorNode): Node(editorNode)
-{}
+LuminanceMatteNode::LuminanceMatteNode(bNode *editorNode) : Node(editorNode)
+{
+	/* pass */
+}
 
 void LuminanceMatteNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
@@ -37,7 +39,7 @@ void LuminanceMatteNode::convertToOperations(ExecutionSystem *graph, CompositorC
 	ConvertRGBToYUVOperation *rgbToYUV = new ConvertRGBToYUVOperation();
 	LuminanceMatteOperation *operationSet = new LuminanceMatteOperation();
 	bNode *editorsnode = getbNode();
-	operationSet->setSettings((NodeChroma*)editorsnode->storage);
+	operationSet->setSettings((NodeChroma *)editorsnode->storage);
 
 	inputSocket->relinkConnections(rgbToYUV->getInputSocket(0), 0, graph);
 	addLink(graph, rgbToYUV->getOutputSocket(), operationSet->getInputSocket(0));
diff --git a/source/blender/compositor/nodes/COM_MapUVNode.cpp b/source/blender/compositor/nodes/COM_MapUVNode.cpp
index e0e7e2594ed..447b8239a93 100644
--- a/source/blender/compositor/nodes/COM_MapUVNode.cpp
+++ b/source/blender/compositor/nodes/COM_MapUVNode.cpp
@@ -23,11 +23,12 @@
 #include "COM_MapUVOperation.h"
 #include "COM_ExecutionSystem.h"
 
-MapUVNode::MapUVNode(bNode *editorNode): Node(editorNode)
+MapUVNode::MapUVNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void MapUVNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void MapUVNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	MapUVOperation *operation = new MapUVOperation();
 
diff --git a/source/blender/compositor/nodes/COM_MapValueNode.cpp b/source/blender/compositor/nodes/COM_MapValueNode.cpp
index f56662b1d64..ba2fc804f42 100644
--- a/source/blender/compositor/nodes/COM_MapValueNode.cpp
+++ b/source/blender/compositor/nodes/COM_MapValueNode.cpp
@@ -25,15 +25,16 @@
 #include "COM_MapValueOperation.h"
 #include "COM_ExecutionSystem.h"
 
-MapValueNode::MapValueNode(bNode *editorNode): Node(editorNode)
+MapValueNode::MapValueNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void MapValueNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void MapValueNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *colourSocket = this->getInputSocket(0);
 	OutputSocket *valueSocket = this->getOutputSocket(0);
-	TexMapping *storage =  (TexMapping*)this->getbNode()->storage;
+	TexMapping *storage =  (TexMapping *)this->getbNode()->storage;
 	MapValueOperation *convertProg = new MapValueOperation();
 	convertProg->setSettings(storage);
 	colourSocket->relinkConnections(convertProg->getInputSocket(0), 0, graph);
diff --git a/source/blender/compositor/nodes/COM_MaskNode.cpp b/source/blender/compositor/nodes/COM_MaskNode.cpp
index 4371a848a3d..ed07e41a649 100644
--- a/source/blender/compositor/nodes/COM_MaskNode.cpp
+++ b/source/blender/compositor/nodes/COM_MaskNode.cpp
@@ -29,11 +29,12 @@ extern "C" {
 	#include "DNA_mask_types.h"
 }
 
-MaskNode::MaskNode(bNode *editorNode): Node(editorNode)
+MaskNode::MaskNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void MaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void MaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	const RenderData *data = &context->getScene()->r;
 
@@ -54,7 +55,7 @@ void MaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext * c
 
 	operation->setMask(mask);
 	operation->setFramenumber(context->getFramenumber());
-    operation->setSmooth((bool)editorNode->custom1);
+	operation->setSmooth((bool)editorNode->custom1);
 
 	graph->addOperation(operation);
 }
diff --git a/source/blender/compositor/nodes/COM_MathNode.cpp b/source/blender/compositor/nodes/COM_MathNode.cpp
index eabd0481e38..6e9b49253e7 100644
--- a/source/blender/compositor/nodes/COM_MathNode.cpp
+++ b/source/blender/compositor/nodes/COM_MathNode.cpp
@@ -24,61 +24,61 @@
 #include "COM_MathBaseOperation.h"
 #include "COM_ExecutionSystem.h"
 
-void MathNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void MathNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
-	MathBaseOperation *operation=NULL;
+	MathBaseOperation *operation = NULL;
 	
 	switch (this->getbNode()->custom1)
 	{
-	case 0: /* Add */
+		case 0: /* Add */
 			operation = new MathAddOperation();
 			break;
-	case 1: /* Subtract */
+		case 1: /* Subtract */
 			operation = new MathSubtractOperation();
 			break;
-	case 2: /* Multiply */
+		case 2: /* Multiply */
 			operation = new MathMultiplyOperation();
 			break;
-	case 3: /* Divide */
+		case 3: /* Divide */
 			operation = new MathDivideOperation();
 			break;
-	case 4: /* Sine */
+		case 4: /* Sine */
 			operation = new MathSineOperation();
 			break;
-	case 5: /* Cosine */
+		case 5: /* Cosine */
 			operation = new MathCosineOperation();
 			break;
-	case 6: /* Tangent */
+		case 6: /* Tangent */
 			operation = new MathTangentOperation();
 			break;
-	case 7: /* Arc-Sine */
+		case 7: /* Arc-Sine */
 			operation = new MathArcSineOperation();
 			break;
-	case 8: /* Arc-Cosine */
+		case 8: /* Arc-Cosine */
 			operation = new MathArcCosineOperation();
 			break;
-	case 9: /* Arc-Tangent */
+		case 9: /* Arc-Tangent */
 			operation = new MathArcTangentOperation();
 			break;
-	case 10: /* Power */
+		case 10: /* Power */
 			operation = new MathPowerOperation();
 			break;
-	case 11: /* Logarithm */
+		case 11: /* Logarithm */
 			operation = new MathLogarithmOperation();
 			break;
-	case 12: /* Minimum */
+		case 12: /* Minimum */
 			operation = new MathMinimumOperation();
 			break;
-	case 13: /* Maximum */
+		case 13: /* Maximum */
 			operation = new MathMaximumOperation();
 			break;
-	case 14: /* Round */
+		case 14: /* Round */
 			operation = new MathRoundOperation();
 			break;
-	case 15: /* Less Than */
+		case 15: /* Less Than */
 			operation = new MathLessThanOperation();
 			break;
-	case 16: /* Greater Than */
+		case 16: /* Greater Than */
 			operation = new MathGreaterThanOperation();
 			break;
 	}
diff --git a/source/blender/compositor/nodes/COM_MixNode.cpp b/source/blender/compositor/nodes/COM_MixNode.cpp
index 42e32a4e55e..eb62ebd2635 100644
--- a/source/blender/compositor/nodes/COM_MixNode.cpp
+++ b/source/blender/compositor/nodes/COM_MixNode.cpp
@@ -46,12 +46,12 @@
 #include "DNA_material_types.h" // the ramp types
 
 
-MixNode::MixNode(bNode *editorNode): Node(editorNode)
+MixNode::MixNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-
-void MixNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void MixNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *valueSocket = this->getInputSocket(0);
 	InputSocket *color1Socket = this->getInputSocket(1);
@@ -62,62 +62,62 @@ void MixNode::convertToOperations(ExecutionSystem *graph, CompositorContext * co
 	MixBaseOperation *convertProg;
 	
 	switch (editorNode->custom1) {
-	case MA_RAMP_ADD:
-		convertProg = new MixAddOperation();
-		break;
-	case MA_RAMP_MULT:
-		convertProg = new MixMultiplyOperation();
-		break;
-	case MA_RAMP_LIGHT:
-		convertProg = new MixLightenOperation();
-		break;
-	case MA_RAMP_BURN:
-		convertProg = new MixBurnOperation();
-		break;
-	case MA_RAMP_HUE:
-		convertProg = new MixHueOperation();
-		break;
-	case MA_RAMP_COLOR:
-		convertProg = new MixColorOperation();
-		break;
-	case MA_RAMP_SOFT:
-		convertProg = new MixSoftLightOperation();
-		break;
-	case MA_RAMP_SCREEN:
-		convertProg = new MixScreenOperation();
-		break;
-	case MA_RAMP_LINEAR:
-		convertProg = new MixLinearLightOperation();
-		break;
-	case MA_RAMP_DIFF:
-		convertProg = new MixDifferenceOperation();
-		break;
-	case MA_RAMP_SAT:
-		convertProg = new MixSaturationOperation();
-		break;
-	case MA_RAMP_DIV:
-		convertProg = new MixDivideOperation();
-		break;
-	case MA_RAMP_SUB:
-		convertProg = new MixSubtractOperation();
-		break;
-	case MA_RAMP_DARK:
-		convertProg = new MixDarkenOperation();
-		break;
-	case MA_RAMP_OVERLAY:
-		convertProg = new MixOverlayOperation();
-		break;
-	case MA_RAMP_VAL:
-		convertProg = new MixValueOperation();
-		break;
-	case MA_RAMP_DODGE:
-		convertProg = new MixDodgeOperation();
-		break;
-	
-	case MA_RAMP_BLEND:
-	default:
-		convertProg = new MixBlendOperation();
-		break;
+		case MA_RAMP_ADD:
+			convertProg = new MixAddOperation();
+			break;
+		case MA_RAMP_MULT:
+			convertProg = new MixMultiplyOperation();
+			break;
+		case MA_RAMP_LIGHT:
+			convertProg = new MixLightenOperation();
+			break;
+		case MA_RAMP_BURN:
+			convertProg = new MixBurnOperation();
+			break;
+		case MA_RAMP_HUE:
+			convertProg = new MixHueOperation();
+			break;
+		case MA_RAMP_COLOR:
+			convertProg = new MixColorOperation();
+			break;
+		case MA_RAMP_SOFT:
+			convertProg = new MixSoftLightOperation();
+			break;
+		case MA_RAMP_SCREEN:
+			convertProg = new MixScreenOperation();
+			break;
+		case MA_RAMP_LINEAR:
+			convertProg = new MixLinearLightOperation();
+			break;
+		case MA_RAMP_DIFF:
+			convertProg = new MixDifferenceOperation();
+			break;
+		case MA_RAMP_SAT:
+			convertProg = new MixSaturationOperation();
+			break;
+		case MA_RAMP_DIV:
+			convertProg = new MixDivideOperation();
+			break;
+		case MA_RAMP_SUB:
+			convertProg = new MixSubtractOperation();
+			break;
+		case MA_RAMP_DARK:
+			convertProg = new MixDarkenOperation();
+			break;
+		case MA_RAMP_OVERLAY:
+			convertProg = new MixOverlayOperation();
+			break;
+		case MA_RAMP_VAL:
+			convertProg = new MixValueOperation();
+			break;
+		case MA_RAMP_DODGE:
+			convertProg = new MixDodgeOperation();
+			break;
+
+		case MA_RAMP_BLEND:
+		default:
+			convertProg = new MixBlendOperation();
+			break;
 	}
 	convertProg->setUseValueAlphaMultiply(this->getbNode()->custom2);
 
diff --git a/source/blender/compositor/nodes/COM_MovieClipNode.cpp b/source/blender/compositor/nodes/COM_MovieClipNode.cpp
index 083d1bf42b9..89bd0e8549e 100644
--- a/source/blender/compositor/nodes/COM_MovieClipNode.cpp
+++ b/source/blender/compositor/nodes/COM_MovieClipNode.cpp
@@ -33,11 +33,12 @@ extern "C" {
 	#include "IMB_imbuf.h"
 }
 
-MovieClipNode::MovieClipNode(bNode *editorNode): Node(editorNode)
+MovieClipNode::MovieClipNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void MovieClipNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void MovieClipNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	OutputSocket *outputMovieClip = this->getOutputSocket(0);
 	OutputSocket *offsetXMovieClip = this->getOutputSocket(1);
@@ -46,10 +47,10 @@ void MovieClipNode::convertToOperations(ExecutionSystem *graph, CompositorContex
 	OutputSocket *angleMovieClip = this->getOutputSocket(4);
 	
 	bNode *editorNode = this->getbNode();
-	MovieClip *movieClip = (MovieClip*)editorNode->id;
-	MovieClipUser *movieClipUser = (MovieClipUser*)editorNode->storage;
+	MovieClip *movieClip = (MovieClip *)editorNode->id;
+	MovieClipUser *movieClipUser = (MovieClipUser *)editorNode->storage;
 	
-	ImBuf * ibuf = NULL;
+	ImBuf *ibuf = NULL;
 	if (movieClip) {
 		ibuf = BKE_movieclip_get_ibuf(movieClip, movieClipUser);
 	}
@@ -90,7 +91,7 @@ void MovieClipNode::convertToOperations(ExecutionSystem *graph, CompositorContex
 	angle = 0.0f;
 
 	if (ibuf) {
-		if (stab->flag&TRACKING_2D_STABILIZATION) {
+		if (stab->flag & TRACKING_2D_STABILIZATION) {
 			int clip_framenr = BKE_movieclip_remap_scene_to_clip_frame(movieClip, context->getFramenumber());
 
 			BKE_tracking_stabilization_data_get(&movieClip->tracking, clip_framenr, ibuf->x, ibuf->y, loc, &scale, &angle);
@@ -98,25 +99,25 @@ void MovieClipNode::convertToOperations(ExecutionSystem *graph, CompositorContex
 	}
 	
 	if (offsetXMovieClip->isConnected()) {
-		SetValueOperation * operationSetValue = new SetValueOperation();
+		SetValueOperation *operationSetValue = new SetValueOperation();
 		operationSetValue->setValue(loc[0]);
 		offsetXMovieClip->relinkConnections(operationSetValue->getOutputSocket());
 		graph->addOperation(operationSetValue);
 	}
 	if (offsetYMovieClip->isConnected()) {
-		SetValueOperation * operationSetValue = new SetValueOperation();
+		SetValueOperation *operationSetValue = new SetValueOperation();
 		operationSetValue->setValue(loc[1]);
 		offsetYMovieClip->relinkConnections(operationSetValue->getOutputSocket());
 		graph->addOperation(operationSetValue);
 	}
 	if (scaleMovieClip->isConnected()) {
-		SetValueOperation * operationSetValue = new SetValueOperation();
+		SetValueOperation *operationSetValue = new SetValueOperation();
 		operationSetValue->setValue(scale);
 		scaleMovieClip->relinkConnections(operationSetValue->getOutputSocket());
 		graph->addOperation(operationSetValue);
 	}
 	if (angleMovieClip->isConnected()) {
-		SetValueOperation * operationSetValue = new SetValueOperation();
+		SetValueOperation *operationSetValue = new SetValueOperation();
 		operationSetValue->setValue(angle);
 		angleMovieClip->relinkConnections(operationSetValue->getOutputSocket());
 		graph->addOperation(operationSetValue);
diff --git a/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp b/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp
index bdf4c53fa72..c29bc27cd80 100644
--- a/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp
+++ b/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp
@@ -28,16 +28,17 @@
 
 MovieDistortionNode::MovieDistortionNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void MovieDistortionNode::convertToOperations(ExecutionSystem *system, CompositorContext * context)
+void MovieDistortionNode::convertToOperations(ExecutionSystem *system, CompositorContext *context)
 {
 	InputSocket *inputSocket = this->getInputSocket(0);
 	OutputSocket *outputSocket = this->getOutputSocket(0);
 	bNode *bnode = this->getbNode();
-	MovieClip * clip = (MovieClip*)bnode->id;
+	MovieClip *clip = (MovieClip *)bnode->id;
 	
-	MovieDistortionOperation * operation = new MovieDistortionOperation(bnode->custom1 == 1);
+	MovieDistortionOperation *operation = new MovieDistortionOperation(bnode->custom1 == 1);
 	operation->setMovieClip(clip);
 	operation->setFramenumber(context->getFramenumber());
 
diff --git a/source/blender/compositor/nodes/COM_MuteNode.cpp b/source/blender/compositor/nodes/COM_MuteNode.cpp
index 57b7871318b..ccf7721b989 100644
--- a/source/blender/compositor/nodes/COM_MuteNode.cpp
+++ b/source/blender/compositor/nodes/COM_MuteNode.cpp
@@ -27,14 +27,15 @@
 #include "COM_SetVectorOperation.h"
 #include "COM_SetColorOperation.h"
 
-MuteNode::MuteNode(bNode *editorNode): Node(editorNode)
+MuteNode::MuteNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void MuteNode::reconnect(ExecutionSystem * graph, OutputSocket * output)
+void MuteNode::reconnect(ExecutionSystem *graph, OutputSocket *output)
 {
-	vector<InputSocket*> &inputsockets = this->getInputSockets();
-	for (unsigned int index = 0; index < inputsockets.size() ; index ++) {
+	vector<InputSocket *> &inputsockets = this->getInputSockets();
+	for (unsigned int index = 0; index < inputsockets.size(); index++) {
 		InputSocket *input = inputsockets[index];
 		if (input->getDataType() == output->getDataType()) {
 			if (input->isConnected()) {
@@ -82,12 +83,12 @@ void MuteNode::reconnect(ExecutionSystem * graph, OutputSocket * output)
 	output->clearConnections();
 }
 
-void MuteNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void MuteNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
-	vector<OutputSocket*> &outputsockets = this->getOutputSockets();
+	vector<OutputSocket *> &outputsockets = this->getOutputSockets();
 
-	for (unsigned int index = 0 ; index < outputsockets.size() ; index ++) {
-		OutputSocket * output = outputsockets[index];
+	for (unsigned int index = 0; index < outputsockets.size(); index++) {
+		OutputSocket *output = outputsockets[index];
 		if (output->isConnected()) {
 			reconnect(graph, output);
 		}
diff --git a/source/blender/compositor/nodes/COM_NormalNode.cpp b/source/blender/compositor/nodes/COM_NormalNode.cpp
index 0b1faafe302..e00e71e50e9 100644
--- a/source/blender/compositor/nodes/COM_NormalNode.cpp
+++ b/source/blender/compositor/nodes/COM_NormalNode.cpp
@@ -26,19 +26,21 @@
 #include "COM_DotproductOperation.h"
 #include "COM_SetVectorOperation.h"
 
-NormalNode::NormalNode(bNode *editorNode): Node(editorNode)
-{}
+NormalNode::NormalNode(bNode *editorNode) : Node(editorNode)
+{
+	/* pass */
+}
 
-void NormalNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void NormalNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *inputSocket = this->getInputSocket(0);
 	OutputSocket *outputSocket = this->getOutputSocket(0);
 	OutputSocket *outputSocketDotproduct = this->getOutputSocket(1);
 	bNode *editorNode = this->getbNode();
 	
-	SetVectorOperation * operationSet = new SetVectorOperation();
-	bNodeSocket * insock = (bNodeSocket*)editorNode->outputs.first;
-	bNodeSocketValueVector *dval = (bNodeSocketValueVector*)insock->default_value;
+	SetVectorOperation *operationSet = new SetVectorOperation();
+	bNodeSocket *insock = (bNodeSocket *)editorNode->outputs.first;
+	bNodeSocketValueVector *dval = (bNodeSocketValueVector *)insock->default_value;
 	operationSet->setX(dval->value[0]);
 	operationSet->setY(dval->value[1]);
 	operationSet->setZ(dval->value[2]);
diff --git a/source/blender/compositor/nodes/COM_NormalizeNode.cpp b/source/blender/compositor/nodes/COM_NormalizeNode.cpp
index 11173b3a73f..7c1c695f8b6 100644
--- a/source/blender/compositor/nodes/COM_NormalizeNode.cpp
+++ b/source/blender/compositor/nodes/COM_NormalizeNode.cpp
@@ -23,11 +23,12 @@
 #include "COM_NormalizeOperation.h"
 #include "COM_ExecutionSystem.h"
 
-NormalizeNode::NormalizeNode(bNode *editorNode): Node(editorNode)
+NormalizeNode::NormalizeNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void NormalizeNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void NormalizeNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	NormalizeOperation *operation = new NormalizeOperation();
 
diff --git a/source/blender/compositor/nodes/COM_OutputFileNode.cpp b/source/blender/compositor/nodes/COM_OutputFileNode.cpp
index e5deb595d78..402529b9186 100644
--- a/source/blender/compositor/nodes/COM_OutputFileNode.cpp
+++ b/source/blender/compositor/nodes/COM_OutputFileNode.cpp
@@ -27,13 +27,14 @@
 #include "BLI_path_util.h"
 #include "BKE_utildefines.h"
 
-OutputFileNode::OutputFileNode(bNode *editorNode): Node(editorNode)
+OutputFileNode::OutputFileNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void OutputFileNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void OutputFileNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
-	NodeImageMultiFile *storage = (NodeImageMultiFile*)this->getbNode()->storage;
+	NodeImageMultiFile *storage = (NodeImageMultiFile *)this->getbNode()->storage;
 	
 	if (!context->isRendering()) {
 		/* XXX TODO as in previous implementation?
@@ -41,14 +42,14 @@ void OutputFileNode::convertToOperations(ExecutionSystem *graph, CompositorConte
 		 */
 	}
 	
-	if (storage->format.imtype==R_IMF_IMTYPE_MULTILAYER) {
+	if (storage->format.imtype == R_IMF_IMTYPE_MULTILAYER) {
 		/* single output operation for the multilayer file */
 		OutputOpenExrMultiLayerOperation *outputOperation = new OutputOpenExrMultiLayerOperation(
-				context->getScene(), context->getbNodeTree(), storage->base_path, storage->format.exr_codec);
+		        context->getScene(), context->getbNodeTree(), storage->base_path, storage->format.exr_codec);
 		
 		int num_inputs = getNumberOfInputSockets();
 		bool hasConnections = false;
-		for (int i=0; i < num_inputs; ++i) {
+		for (int i = 0; i < num_inputs; ++i) {
 			InputSocket *input = getInputSocket(i);
 			if (input->isConnected()) {
 				hasConnections = true;
@@ -63,10 +64,10 @@ void OutputFileNode::convertToOperations(ExecutionSystem *graph, CompositorConte
 		
 		graph->addOperation(outputOperation);
 	}
-	else {	/* single layer format */
+	else {  /* single layer format */
 		int num_inputs = getNumberOfInputSockets();
 		bool previewAdded = false;
-		for (int i=0; i < num_inputs; ++i) {
+		for (int i = 0; i < num_inputs; ++i) {
 			InputSocket *input = getInputSocket(i);
 			if (input->isConnected()) {
 				NodeImageMultiFileSocket *sockdata = (NodeImageMultiFileSocket *)input->getbNodeSocket()->storage;
@@ -77,7 +78,7 @@ void OutputFileNode::convertToOperations(ExecutionSystem *graph, CompositorConte
 				BLI_join_dirfile(path, FILE_MAX, storage->base_path, sockdata->path);
 				
 				OutputSingleLayerOperation *outputOperation = new OutputSingleLayerOperation(
-						context->getScene(), context->getbNodeTree(), input->getDataType(), format, path);
+				        context->getScene(), context->getbNodeTree(), input->getDataType(), format, path);
 				input->relinkConnections(outputOperation->getInputSocket(0));
 				graph->addOperation(outputOperation);
 				if (!previewAdded) {
diff --git a/source/blender/compositor/nodes/COM_RenderLayersNode.cpp b/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
index 8216205b925..95e759fde24 100644
--- a/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
+++ b/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
@@ -47,14 +47,15 @@
 #include "COM_ScaleOperation.h"
 #include "COM_SetValueOperation.h"
 
-RenderLayersNode::RenderLayersNode(bNode *editorNode): Node(editorNode)
+RenderLayersNode::RenderLayersNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void RenderLayersNode::testSocketConnection(ExecutionSystem *system, int outputSocketNumber, RenderLayersBaseProg * operation)
+void RenderLayersNode::testSocketConnection(ExecutionSystem *system, int outputSocketNumber, RenderLayersBaseProg *operation)
 {
 	OutputSocket *outputSocket = this->getOutputSocket(outputSocketNumber);
-	Scene *scene = (Scene*)this->getbNode()->id;
+	Scene *scene = (Scene *)this->getbNode()->id;
 	short layerId = this->getbNode()->custom1;
 
 	if (outputSocket->isConnected()) {
@@ -79,7 +80,7 @@ void RenderLayersNode::testSocketConnection(ExecutionSystem *system, int outputS
 	}
 }
 
-void RenderLayersNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void RenderLayersNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	testSocketConnection(graph, 0, new RenderLayersColourProg());
 	testSocketConnection(graph, 1, new RenderLayersAlphaProg());
diff --git a/source/blender/compositor/nodes/COM_RotateNode.cpp b/source/blender/compositor/nodes/COM_RotateNode.cpp
index 48acc567739..bb058d18b80 100644
--- a/source/blender/compositor/nodes/COM_RotateNode.cpp
+++ b/source/blender/compositor/nodes/COM_RotateNode.cpp
@@ -28,9 +28,10 @@
 
 RotateNode::RotateNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void RotateNode::convertToOperations(ExecutionSystem *system, CompositorContext * context)
+void RotateNode::convertToOperations(ExecutionSystem *system, CompositorContext *context)
 {
 	InputSocket *inputSocket = this->getInputSocket(0);
 	InputSocket *inputDegreeSocket = this->getInputSocket(1);
@@ -39,15 +40,15 @@ void RotateNode::convertToOperations(ExecutionSystem *system, CompositorContext
 	SetSamplerOperation *sampler = new SetSamplerOperation();
 
 	switch (this->getbNode()->custom1) {
-	case 0:
-		sampler->setSampler(COM_PS_NEAREST);
-		break ;
-	case 1:
-		sampler->setSampler(COM_PS_BILINEAR);
-		break;
-	case 2:
-		sampler->setSampler(COM_PS_BICUBIC);
-		break;
+		case 0:
+			sampler->setSampler(COM_PS_NEAREST);
+			break;
+		case 1:
+			sampler->setSampler(COM_PS_BILINEAR);
+			break;
+		case 2:
+			sampler->setSampler(COM_PS_BICUBIC);
+			break;
 	
 	}
 
diff --git a/source/blender/compositor/nodes/COM_ScaleNode.cpp b/source/blender/compositor/nodes/COM_ScaleNode.cpp
index 870ed8f2484..17b521c589d 100644
--- a/source/blender/compositor/nodes/COM_ScaleNode.cpp
+++ b/source/blender/compositor/nodes/COM_ScaleNode.cpp
@@ -29,6 +29,7 @@
 
 ScaleNode::ScaleNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
 void ScaleNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
diff --git a/source/blender/compositor/nodes/COM_SeparateHSVANode.cpp b/source/blender/compositor/nodes/COM_SeparateHSVANode.cpp
index cfce56a080a..4f93b226fa1 100644
--- a/source/blender/compositor/nodes/COM_SeparateHSVANode.cpp
+++ b/source/blender/compositor/nodes/COM_SeparateHSVANode.cpp
@@ -27,11 +27,12 @@
 #include "COM_SetValueOperation.h"
 #include "COM_ConvertRGBToHSVOperation.h"
 
-SeparateHSVANode::SeparateHSVANode(bNode *editorNode): SeparateRGBANode(editorNode)
+SeparateHSVANode::SeparateHSVANode(bNode *editorNode) : SeparateRGBANode(editorNode)
 {
+	/* pass */
 }
 
-void SeparateHSVANode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void SeparateHSVANode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	ConvertRGBToHSVOperation *operation = new ConvertRGBToHSVOperation();
 	InputSocket *inputSocket = this->getInputSocket(0);
diff --git a/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp b/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp
index dd154fe604d..67ac6ffc388 100644
--- a/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp
+++ b/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp
@@ -28,12 +28,13 @@
 #include "DNA_material_types.h" // the ramp types
 
 
-SeparateRGBANode::SeparateRGBANode(bNode *editorNode): Node(editorNode)
+SeparateRGBANode::SeparateRGBANode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
 
-void SeparateRGBANode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void SeparateRGBANode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *imageSocket = this->getInputSocket(0);
 	OutputSocket *outputRSocket = this->getOutputSocket(0);
diff --git a/source/blender/compositor/nodes/COM_SeparateYCCANode.cpp b/source/blender/compositor/nodes/COM_SeparateYCCANode.cpp
index 68d20235de7..154e2bcd550 100644
--- a/source/blender/compositor/nodes/COM_SeparateYCCANode.cpp
+++ b/source/blender/compositor/nodes/COM_SeparateYCCANode.cpp
@@ -25,8 +25,9 @@
 #include "COM_SetValueOperation.h"
 #include "COM_ConvertRGBToYCCOperation.h"
 
-SeparateYCCANode::SeparateYCCANode(bNode *editorNode): SeparateRGBANode(editorNode)
+SeparateYCCANode::SeparateYCCANode(bNode *editorNode) : SeparateRGBANode(editorNode)
 {
+	/* pass */
 }
 
 void SeparateYCCANode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
diff --git a/source/blender/compositor/nodes/COM_SeparateYUVANode.cpp b/source/blender/compositor/nodes/COM_SeparateYUVANode.cpp
index 650e5d1340b..8a647b7f849 100644
--- a/source/blender/compositor/nodes/COM_SeparateYUVANode.cpp
+++ b/source/blender/compositor/nodes/COM_SeparateYUVANode.cpp
@@ -25,8 +25,9 @@
 #include "COM_SetValueOperation.h"
 #include "COM_ConvertRGBToYUVOperation.h"
 
-SeparateYUVANode::SeparateYUVANode(bNode *editorNode): SeparateRGBANode(editorNode)
+SeparateYUVANode::SeparateYUVANode(bNode *editorNode) : SeparateRGBANode(editorNode)
 {
+	/* pass */
 }
 
 void SeparateYUVANode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
diff --git a/source/blender/compositor/nodes/COM_SetAlphaNode.cpp b/source/blender/compositor/nodes/COM_SetAlphaNode.cpp
index 1d09b81c4d2..709dc75b502 100644
--- a/source/blender/compositor/nodes/COM_SetAlphaNode.cpp
+++ b/source/blender/compositor/nodes/COM_SetAlphaNode.cpp
@@ -24,7 +24,7 @@
 #include "COM_SetAlphaOperation.h"
 #include "COM_ExecutionSystem.h"
 
-void SetAlphaNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void SetAlphaNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	SetAlphaOperation *operation = new SetAlphaOperation();
 	
diff --git a/source/blender/compositor/nodes/COM_SocketProxyNode.cpp b/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
index cdb844cad54..bfb32a96156 100644
--- a/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
+++ b/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
@@ -28,7 +28,7 @@
 #include "COM_SetVectorOperation.h"
 #include "COM_SetColorOperation.h"
 
-SocketProxyNode::SocketProxyNode(bNode *editorNode, bNodeSocket *editorInput, bNodeSocket *editorOutput): Node(editorNode, false)
+SocketProxyNode::SocketProxyNode(bNode *editorNode, bNodeSocket *editorInput, bNodeSocket *editorOutput) : Node(editorNode, false)
 {
 	DataType dt;
 	
@@ -43,10 +43,10 @@ SocketProxyNode::SocketProxyNode(bNode *editorNode, bNodeSocket *editorInput, bN
 	this->addOutputSocket(dt, editorOutput);
 }
 
-void SocketProxyNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void SocketProxyNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
-	OutputSocket * outputsocket = this->getOutputSocket(0);
-	InputSocket * inputsocket = this->getInputSocket(0);
+	OutputSocket *outputsocket = this->getOutputSocket(0);
+	InputSocket *inputsocket = this->getInputSocket(0);
 	if (outputsocket->isConnected()) {
 		if (inputsocket->isConnected()) {
 			SocketProxyOperation *operation = new SocketProxyOperation(this->getOutputSocket()->getDataType());
@@ -57,33 +57,33 @@ void SocketProxyNode::convertToOperations(ExecutionSystem *graph, CompositorCont
 		else {
 			/* If input is not connected, add a constant value operation instead */
 			switch (outputsocket->getDataType()) {
-			case COM_DT_VALUE:
-			{
-				SetValueOperation *operation = new SetValueOperation();
-				bNodeSocketValueFloat *dval = (bNodeSocketValueFloat*)inputsocket->getbNodeSocket()->default_value;
-				operation->setValue(dval->value);
-				outputsocket->relinkConnections(operation->getOutputSocket(0));
-				graph->addOperation(operation);
-				break;
-			}
-			case COM_DT_COLOR:
-			{
-				SetColorOperation *operation = new SetColorOperation();
-				bNodeSocketValueRGBA *dval = (bNodeSocketValueRGBA*)inputsocket->getbNodeSocket()->default_value;
-				operation->setChannels(dval->value);
-				outputsocket->relinkConnections(operation->getOutputSocket(0));
-				graph->addOperation(operation);
-				break;
-			}
-			case COM_DT_VECTOR:
-			{
-				SetVectorOperation *operation = new SetVectorOperation();
-				bNodeSocketValueVector *dval = (bNodeSocketValueVector*)inputsocket->getbNodeSocket()->default_value;
-				operation->setVector(dval->value);
-				outputsocket->relinkConnections(operation->getOutputSocket(0));
-				graph->addOperation(operation);
-				break;
-			}
+				case COM_DT_VALUE:
+				{
+					SetValueOperation *operation = new SetValueOperation();
+					bNodeSocketValueFloat *dval = (bNodeSocketValueFloat *)inputsocket->getbNodeSocket()->default_value;
+					operation->setValue(dval->value);
+					outputsocket->relinkConnections(operation->getOutputSocket(0));
+					graph->addOperation(operation);
+					break;
+				}
+				case COM_DT_COLOR:
+				{
+					SetColorOperation *operation = new SetColorOperation();
+					bNodeSocketValueRGBA *dval = (bNodeSocketValueRGBA *)inputsocket->getbNodeSocket()->default_value;
+					operation->setChannels(dval->value);
+					outputsocket->relinkConnections(operation->getOutputSocket(0));
+					graph->addOperation(operation);
+					break;
+				}
+				case COM_DT_VECTOR:
+				{
+					SetVectorOperation *operation = new SetVectorOperation();
+					bNodeSocketValueVector *dval = (bNodeSocketValueVector *)inputsocket->getbNodeSocket()->default_value;
+					operation->setVector(dval->value);
+					outputsocket->relinkConnections(operation->getOutputSocket(0));
+					graph->addOperation(operation);
+					break;
+				}
 			}
 		}
 	}
diff --git a/source/blender/compositor/nodes/COM_SplitViewerNode.cpp b/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
index 7e8a218cbc1..22a00410384 100644
--- a/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
+++ b/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
@@ -28,6 +28,7 @@
 
 SplitViewerNode::SplitViewerNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
 void SplitViewerNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
diff --git a/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp b/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
index 7234e71a43c..85b8695263f 100644
--- a/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
+++ b/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
@@ -32,18 +32,19 @@ extern "C" {
 	#include "BKE_tracking.h"
 }
 
-Stabilize2dNode::Stabilize2dNode(bNode *editorNode): Node(editorNode)
+Stabilize2dNode::Stabilize2dNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void Stabilize2dNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void Stabilize2dNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *imageInput = this->getInputSocket(0);
 	MovieClip *clip = (MovieClip *)getbNode()->id;
 	
-	ScaleOperation * scaleOperation = new ScaleOperation();
-	RotateOperation * rotateOperation = new RotateOperation();
-	TranslateOperation * translateOperation = new TranslateOperation();
+	ScaleOperation *scaleOperation = new ScaleOperation();
+	RotateOperation *rotateOperation = new RotateOperation();
+	TranslateOperation *translateOperation = new TranslateOperation();
 	MovieClipAttributeOperation *scaleAttribute = new MovieClipAttributeOperation();
 	MovieClipAttributeOperation *angleAttribute = new MovieClipAttributeOperation();
 	MovieClipAttributeOperation *xAttribute = new MovieClipAttributeOperation();
diff --git a/source/blender/compositor/nodes/COM_SwitchNode.cpp b/source/blender/compositor/nodes/COM_SwitchNode.cpp
index bb1a9c119f8..2a4616fcd3e 100644
--- a/source/blender/compositor/nodes/COM_SwitchNode.cpp
+++ b/source/blender/compositor/nodes/COM_SwitchNode.cpp
@@ -24,14 +24,15 @@
 #include "COM_ExecutionSystem.h"
 #include "COM_SocketProxyOperation.h"
 
-SwitchNode::SwitchNode(bNode *editorNode): Node(editorNode)
+SwitchNode::SwitchNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
 
-void SwitchNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void SwitchNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
-	SocketProxyOperation * operation = new SocketProxyOperation(COM_DT_COLOR);
+	SocketProxyOperation *operation = new SocketProxyOperation(COM_DT_COLOR);
 	int switchFrame = this->getbNode()->custom1;
 
 	if (!switchFrame) {
diff --git a/source/blender/compositor/nodes/COM_TextureNode.cpp b/source/blender/compositor/nodes/COM_TextureNode.cpp
index fe8a8e2250e..a3526e3c1a1 100644
--- a/source/blender/compositor/nodes/COM_TextureNode.cpp
+++ b/source/blender/compositor/nodes/COM_TextureNode.cpp
@@ -24,14 +24,15 @@
 #include "COM_ExecutionSystem.h"
 #include "COM_TextureOperation.h"
 
-TextureNode::TextureNode(bNode *editorNode): Node(editorNode)
+TextureNode::TextureNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void TextureNode::convertToOperations(ExecutionSystem *system, CompositorContext * context)
+void TextureNode::convertToOperations(ExecutionSystem *system, CompositorContext *context)
 {
 	bNode *editorNode = this->getbNode();
-	Tex *texture = (Tex*)editorNode->id;
+	Tex *texture = (Tex *)editorNode->id;
 	TextureOperation *operation = new TextureOperation();
 	this->getOutputSocket(1)->relinkConnections(operation->getOutputSocket());
 	this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, system);
diff --git a/source/blender/compositor/nodes/COM_TimeNode.cpp b/source/blender/compositor/nodes/COM_TimeNode.cpp
index b3ce27a3829..8e155e375e1 100644
--- a/source/blender/compositor/nodes/COM_TimeNode.cpp
+++ b/source/blender/compositor/nodes/COM_TimeNode.cpp
@@ -29,11 +29,12 @@ extern "C" {
 }
 #include "BLI_utildefines.h"
 
-TimeNode::TimeNode(bNode *editorNode): Node(editorNode)
+TimeNode::TimeNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void TimeNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void TimeNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	SetValueOperation *operation = new SetValueOperation();
 	this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket());
@@ -50,10 +51,10 @@ void TimeNode::convertToOperations(ExecutionSystem *graph, CompositorContext * c
 		fac = 1.0f;
 	}
 	else if (node->custom1 < node->custom2) {
-		fac = (context->getFramenumber() - node->custom1)/(float)(node->custom2-node->custom1);
+		fac = (context->getFramenumber() - node->custom1) / (float)(node->custom2 - node->custom1);
 	}
 
-	fac = curvemapping_evaluateF((CurveMapping*)node->storage, 0, fac);
+	fac = curvemapping_evaluateF((CurveMapping *)node->storage, 0, fac);
 	operation->setValue(CLAMPIS(fac, 0.0f, 1.0f));
 	graph->addOperation(operation);
 }
diff --git a/source/blender/compositor/nodes/COM_TonemapNode.cpp b/source/blender/compositor/nodes/COM_TonemapNode.cpp
index 80f02f3edbb..a1f33ed464b 100644
--- a/source/blender/compositor/nodes/COM_TonemapNode.cpp
+++ b/source/blender/compositor/nodes/COM_TonemapNode.cpp
@@ -25,14 +25,15 @@
 #include "COM_TonemapOperation.h"
 #include "COM_ExecutionSystem.h"
 
-TonemapNode::TonemapNode(bNode *editorNode): Node(editorNode)
+TonemapNode::TonemapNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void TonemapNode::convertToOperations(ExecutionSystem *system, CompositorContext * context)
+void TonemapNode::convertToOperations(ExecutionSystem *system, CompositorContext *context)
 {
-	NodeTonemap *data = (NodeTonemap*)this->getbNode()->storage;
-	TonemapOperation *operation = data->type==1?new PhotoreceptorTonemapOperation():new TonemapOperation();
+	NodeTonemap *data = (NodeTonemap *)this->getbNode()->storage;
+	TonemapOperation *operation = data->type == 1 ? new PhotoreceptorTonemapOperation() : new TonemapOperation();
 
 	operation->setData(data);
 	this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, system);
diff --git a/source/blender/compositor/nodes/COM_TransformNode.cpp b/source/blender/compositor/nodes/COM_TransformNode.cpp
index da3e85036a5..ff6e276d1ac 100644
--- a/source/blender/compositor/nodes/COM_TransformNode.cpp
+++ b/source/blender/compositor/nodes/COM_TransformNode.cpp
@@ -28,11 +28,12 @@
 #include "COM_SetValueOperation.h"
 #include "COM_SetSamplerOperation.h"
 
-TransformNode::TransformNode(bNode *editorNode): Node(editorNode)
+TransformNode::TransformNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void TransformNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void TransformNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *imageInput = this->getInputSocket(0);
 	InputSocket *xInput = this->getInputSocket(1);
@@ -40,21 +41,21 @@ void TransformNode::convertToOperations(ExecutionSystem *graph, CompositorContex
 	InputSocket *angleInput = this->getInputSocket(3);
 	InputSocket *scaleInput = this->getInputSocket(4);
 	
-	ScaleOperation * scaleOperation = new ScaleOperation();
-	RotateOperation * rotateOperation = new RotateOperation();
-	TranslateOperation * translateOperation = new TranslateOperation();
+	ScaleOperation *scaleOperation = new ScaleOperation();
+	RotateOperation *rotateOperation = new RotateOperation();
+	TranslateOperation *translateOperation = new TranslateOperation();
 	SetSamplerOperation *sampler = new SetSamplerOperation();
 
 	switch (this->getbNode()->custom1) {
-	case 0:
-		sampler->setSampler(COM_PS_NEAREST);
-		break ;
-	case 1:
-		sampler->setSampler(COM_PS_BILINEAR);
-		break;
-	case 2:
-		sampler->setSampler(COM_PS_BICUBIC);
-		break;
+		case 0:
+			sampler->setSampler(COM_PS_NEAREST);
+			break;
+		case 1:
+			sampler->setSampler(COM_PS_BILINEAR);
+			break;
+		case 2:
+			sampler->setSampler(COM_PS_BICUBIC);
+			break;
 	}
 	
 	imageInput->relinkConnections(sampler->getInputSocket(0), 0, graph);
diff --git a/source/blender/compositor/nodes/COM_TranslateNode.cpp b/source/blender/compositor/nodes/COM_TranslateNode.cpp
index 407c6da4e4d..c805f8f8baa 100644
--- a/source/blender/compositor/nodes/COM_TranslateNode.cpp
+++ b/source/blender/compositor/nodes/COM_TranslateNode.cpp
@@ -27,9 +27,10 @@
 
 TranslateNode::TranslateNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void TranslateNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void TranslateNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *inputSocket = this->getInputSocket(0);
 	InputSocket *inputXSocket = this->getInputSocket(1);
diff --git a/source/blender/compositor/nodes/COM_ValueNode.cpp b/source/blender/compositor/nodes/COM_ValueNode.cpp
index 39245e75a2f..89b0602f8b0 100644
--- a/source/blender/compositor/nodes/COM_ValueNode.cpp
+++ b/source/blender/compositor/nodes/COM_ValueNode.cpp
@@ -25,15 +25,16 @@
 #include "COM_SetValueOperation.h"
 #include "COM_ExecutionSystem.h"
 
-ValueNode::ValueNode(bNode *editorNode): Node(editorNode)
+ValueNode::ValueNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void ValueNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void ValueNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	SetValueOperation *operation = new SetValueOperation();
 	bNodeSocket *socket = this->getEditorOutputSocket(0);
-	bNodeSocketValueFloat *dval = (bNodeSocketValueFloat*)socket->default_value;
+	bNodeSocketValueFloat *dval = (bNodeSocketValueFloat *)socket->default_value;
 	this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket());
 	operation->setValue(dval->value);
 	graph->addOperation(operation);
diff --git a/source/blender/compositor/nodes/COM_VectorBlurNode.cpp b/source/blender/compositor/nodes/COM_VectorBlurNode.cpp
index 78b9065b4da..5ef384a9984 100644
--- a/source/blender/compositor/nodes/COM_VectorBlurNode.cpp
+++ b/source/blender/compositor/nodes/COM_VectorBlurNode.cpp
@@ -26,6 +26,7 @@
 
 VectorBlurNode::VectorBlurNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
 void VectorBlurNode::convertToOperations(ExecutionSystem *system, CompositorContext *context)
diff --git a/source/blender/compositor/nodes/COM_VectorCurveNode.cpp b/source/blender/compositor/nodes/COM_VectorCurveNode.cpp
index 908e1a19f16..ee32c3b77a3 100644
--- a/source/blender/compositor/nodes/COM_VectorCurveNode.cpp
+++ b/source/blender/compositor/nodes/COM_VectorCurveNode.cpp
@@ -25,18 +25,19 @@
 #include "COM_VectorCurveOperation.h"
 #include "COM_ExecutionSystem.h"
 
-VectorCurveNode::VectorCurveNode(bNode *editorNode): Node(editorNode)
+VectorCurveNode::VectorCurveNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
-void VectorCurveNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void VectorCurveNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	VectorCurveOperation *operation = new VectorCurveOperation();
 
 	this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
 	this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket());
 
-	operation->setCurveMapping((CurveMapping*)this->getbNode()->storage);
+	operation->setCurveMapping((CurveMapping *)this->getbNode()->storage);
 
 	graph->addOperation(operation);
 }
diff --git a/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp b/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
index a7974efe954..309568c3aec 100644
--- a/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
+++ b/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
@@ -28,7 +28,9 @@
 
 ViewLevelsNode::ViewLevelsNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
+
 void ViewLevelsNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *input = this->getInputSocket(0);
diff --git a/source/blender/compositor/nodes/COM_ViewerNode.cpp b/source/blender/compositor/nodes/COM_ViewerNode.cpp
index 79c76f2e89e..9228fdbef85 100644
--- a/source/blender/compositor/nodes/COM_ViewerNode.cpp
+++ b/source/blender/compositor/nodes/COM_ViewerNode.cpp
@@ -28,6 +28,7 @@
 
 ViewerNode::ViewerNode(bNode *editorNode) : Node(editorNode)
 {
+	/* pass */
 }
 
 void ViewerNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
diff --git a/source/blender/compositor/nodes/COM_ZCombineNode.cpp b/source/blender/compositor/nodes/COM_ZCombineNode.cpp
index 2495d1a5ab2..f48fca72c05 100644
--- a/source/blender/compositor/nodes/COM_ZCombineNode.cpp
+++ b/source/blender/compositor/nodes/COM_ZCombineNode.cpp
@@ -30,10 +30,10 @@
 
 #include "DNA_material_types.h" // the ramp types
 
-void ZCombineNode::convertToOperations(ExecutionSystem *system, CompositorContext * context)
+void ZCombineNode::convertToOperations(ExecutionSystem *system, CompositorContext *context)
 {
 	if (this->getOutputSocket(0)->isConnected()) {
-		ZCombineOperation * operation = NULL;
+		ZCombineOperation *operation = NULL;
 		if (this->getbNode()->custom1) {
 			operation = new ZCombineAlphaOperation();
 		}
@@ -48,7 +48,7 @@ void ZCombineNode::convertToOperations(ExecutionSystem *system, CompositorContex
 		this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket());
 		system->addOperation(operation);
 		if (this->getOutputSocket(1)->isConnected()) {
-			MathMinimumOperation * zoperation = new MathMinimumOperation();
+			MathMinimumOperation *zoperation = new MathMinimumOperation();
 			addLink(system, operation->getInputSocket(1)->getConnection()->getFromSocket(), zoperation->getInputSocket(0));
 			addLink(system, operation->getInputSocket(3)->getConnection()->getFromSocket(), zoperation->getInputSocket(1));
 			this->getOutputSocket(1)->relinkConnections(zoperation->getOutputSocket());
@@ -57,7 +57,7 @@ void ZCombineNode::convertToOperations(ExecutionSystem *system, CompositorContex
 	}
 	else {
 		if (this->getOutputSocket(1)->isConnected()) {
-			MathMinimumOperation * zoperation = new MathMinimumOperation();
+			MathMinimumOperation *zoperation = new MathMinimumOperation();
 			this->getInputSocket(1)->relinkConnections(zoperation->getInputSocket(0), 1, system);
 			this->getInputSocket(3)->relinkConnections(zoperation->getInputSocket(1), 3, system);
 			this->getOutputSocket(1)->relinkConnections(zoperation->getOutputSocket());
diff --git a/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp b/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
index 0c9f9b97031..4a0c8b7ab7f 100644
--- a/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
+++ b/source/blender/compositor/operations/COM_AlphaOverKeyOperation.cpp
@@ -24,6 +24,7 @@
 
 AlphaOverKeyOperation::AlphaOverKeyOperation(): MixBaseOperation()
 {
+	/* pass */
 }
 
 void AlphaOverKeyOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
diff --git a/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp b/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp
index db67f2e0406..5b36f83af41 100644
--- a/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp
+++ b/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.cpp
@@ -24,6 +24,7 @@
 
 AlphaOverPremultiplyOperation::AlphaOverPremultiplyOperation(): MixBaseOperation()
 {
+	/* pass */
 }
 
 void AlphaOverPremultiplyOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
diff --git a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
index dfe1b6aa329..884c22021df 100644
--- a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
+++ b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
@@ -28,6 +28,7 @@
 
 CalculateStandardDeviationOperation::CalculateStandardDeviationOperation(): CalculateMeanOperation()
 {
+	/* pass */
 }
 
 void CalculateStandardDeviationOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void * data)
diff --git a/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cpp b/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cpp
index 6edb046a070..18a12a21f26 100644
--- a/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cpp
+++ b/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cpp
@@ -25,6 +25,7 @@
 
 ConvolutionEdgeFilterOperation::ConvolutionEdgeFilterOperation() : ConvolutionFilterOperation()
 {
+	/* pass */
 }
 
 void ConvolutionEdgeFilterOperation::executePixel(float *color,int x, int y, MemoryBuffer *inputBuffers[], void *data)
diff --git a/source/blender/compositor/operations/COM_CropOperation.cpp b/source/blender/compositor/operations/COM_CropOperation.cpp
index 192ad8d0bda..9b105bb2760 100644
--- a/source/blender/compositor/operations/COM_CropOperation.cpp
+++ b/source/blender/compositor/operations/COM_CropOperation.cpp
@@ -70,6 +70,7 @@ void CropBaseOperation::deinitExecution()
 
 CropOperation::CropOperation() :CropBaseOperation()
 {
+	/* pass */
 }
 
 void CropOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
@@ -87,6 +88,7 @@ void CropOperation::executePixel(float *color, float x, float y, PixelSampler sa
 
 CropImageOperation::CropImageOperation() :CropBaseOperation()
 {
+	/* pass */
 }
 
 bool CropImageOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
diff --git a/source/blender/compositor/operations/COM_DilateErodeOperation.cpp b/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
index f6d794fe564..306a2d96985 100644
--- a/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
+++ b/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
@@ -257,6 +257,7 @@ void DilateDistanceOperation::executeOpenCL(cl_context context, cl_program progr
 // Erode Distance
 ErodeDistanceOperation::ErodeDistanceOperation() : DilateDistanceOperation() 
 {
+	/* pass */
 }
 
 void ErodeDistanceOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
@@ -411,6 +412,7 @@ bool DilateStepOperation::determineDependingAreaOfInterest(rcti *input, ReadBuff
 // Erode step
 ErodeStepOperation::ErodeStepOperation() : DilateStepOperation()
 {
+	/* pass */
 }
 
 void *ErodeStepOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers)
diff --git a/source/blender/compositor/operations/COM_MixAddOperation.cpp b/source/blender/compositor/operations/COM_MixAddOperation.cpp
index a4f601ae9e6..2c25635e3bc 100644
--- a/source/blender/compositor/operations/COM_MixAddOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixAddOperation.cpp
@@ -24,6 +24,7 @@
 
 MixAddOperation::MixAddOperation(): MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixAddOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
diff --git a/source/blender/compositor/operations/COM_MixBlendOperation.cpp b/source/blender/compositor/operations/COM_MixBlendOperation.cpp
index 579f15bcc27..fadac8bbf21 100644
--- a/source/blender/compositor/operations/COM_MixBlendOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixBlendOperation.cpp
@@ -24,6 +24,7 @@
 
 MixBlendOperation::MixBlendOperation(): MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixBlendOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
diff --git a/source/blender/compositor/operations/COM_MixBurnOperation.cpp b/source/blender/compositor/operations/COM_MixBurnOperation.cpp
index 7cad107c5e9..8231a5d60af 100644
--- a/source/blender/compositor/operations/COM_MixBurnOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixBurnOperation.cpp
@@ -24,6 +24,7 @@
 
 MixBurnOperation::MixBurnOperation(): MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixBurnOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
diff --git a/source/blender/compositor/operations/COM_MixColorOperation.cpp b/source/blender/compositor/operations/COM_MixColorOperation.cpp
index e14b10b305e..035e764d780 100644
--- a/source/blender/compositor/operations/COM_MixColorOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixColorOperation.cpp
@@ -28,6 +28,7 @@ extern "C" {
 
 MixColorOperation::MixColorOperation(): MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixColorOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
diff --git a/source/blender/compositor/operations/COM_MixDarkenOperation.cpp b/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
index 666db9d8f32..a1da5dce9c8 100644
--- a/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
@@ -24,6 +24,7 @@
 
 MixDarkenOperation::MixDarkenOperation(): MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixDarkenOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
diff --git a/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp b/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
index 497bb9c2bb5..883837f0917 100644
--- a/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
@@ -25,6 +25,7 @@
 
 MixDifferenceOperation::MixDifferenceOperation(): MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixDifferenceOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
diff --git a/source/blender/compositor/operations/COM_MixDivideOperation.cpp b/source/blender/compositor/operations/COM_MixDivideOperation.cpp
index c522fcf225a..706308dccc5 100644
--- a/source/blender/compositor/operations/COM_MixDivideOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixDivideOperation.cpp
@@ -24,6 +24,7 @@
 
 MixDivideOperation::MixDivideOperation(): MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixDivideOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
diff --git a/source/blender/compositor/operations/COM_MixDodgeOperation.cpp b/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
index 10c04ba376b..619819e6298 100644
--- a/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
@@ -24,6 +24,7 @@
 
 MixDodgeOperation::MixDodgeOperation(): MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixDodgeOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
diff --git a/source/blender/compositor/operations/COM_MixGlareOperation.cpp b/source/blender/compositor/operations/COM_MixGlareOperation.cpp
index 229fc1e5313..71b676622c5 100644
--- a/source/blender/compositor/operations/COM_MixGlareOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixGlareOperation.cpp
@@ -24,6 +24,7 @@
 
 MixGlareOperation::MixGlareOperation(): MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixGlareOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
diff --git a/source/blender/compositor/operations/COM_MixHueOperation.cpp b/source/blender/compositor/operations/COM_MixHueOperation.cpp
index de376f3500c..d97109c244c 100644
--- a/source/blender/compositor/operations/COM_MixHueOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixHueOperation.cpp
@@ -28,6 +28,7 @@ extern "C" {
 
 MixHueOperation::MixHueOperation(): MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixHueOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
diff --git a/source/blender/compositor/operations/COM_MixLightenOperation.cpp b/source/blender/compositor/operations/COM_MixLightenOperation.cpp
index bc3e5090bd8..09d81afcec7 100644
--- a/source/blender/compositor/operations/COM_MixLightenOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixLightenOperation.cpp
@@ -24,6 +24,7 @@
 
 MixLightenOperation::MixLightenOperation(): MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixLightenOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
diff --git a/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp b/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
index b68064f0e47..2e3907c15d4 100644
--- a/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
@@ -24,6 +24,7 @@
 
 MixLinearLightOperation::MixLinearLightOperation(): MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixLinearLightOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
diff --git a/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp b/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp
index fdf8c1ca51b..223aa476f18 100644
--- a/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixMultiplyOperation.cpp
@@ -24,6 +24,7 @@
 
 MixMultiplyOperation::MixMultiplyOperation(): MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixMultiplyOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
diff --git a/source/blender/compositor/operations/COM_MixOverlayOperation.cpp b/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
index 0025daeb3f5..dfea8440b67 100644
--- a/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
@@ -24,6 +24,7 @@
 
 MixOverlayOperation::MixOverlayOperation(): MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixOverlayOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
diff --git a/source/blender/compositor/operations/COM_MixSaturationOperation.cpp b/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
index f6f6ec73c6e..25342abec8a 100644
--- a/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
@@ -28,6 +28,7 @@ extern "C" {
 
 MixSaturationOperation::MixSaturationOperation(): MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixSaturationOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
diff --git a/source/blender/compositor/operations/COM_MixScreenOperation.cpp b/source/blender/compositor/operations/COM_MixScreenOperation.cpp
index a1a98bd82a2..8b9916165e2 100644
--- a/source/blender/compositor/operations/COM_MixScreenOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixScreenOperation.cpp
@@ -24,6 +24,7 @@
 
 MixScreenOperation::MixScreenOperation(): MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixScreenOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
diff --git a/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp b/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
index ea6a3ddd498..a4882b7b83b 100644
--- a/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
@@ -24,6 +24,7 @@
 
 MixSoftLightOperation::MixSoftLightOperation(): MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixSoftLightOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])\
diff --git a/source/blender/compositor/operations/COM_MixSubtractOperation.cpp b/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
index 57320dcd611..d7c7da688a3 100644
--- a/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
@@ -24,6 +24,7 @@
 
 MixSubtractOperation::MixSubtractOperation(): MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixSubtractOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
diff --git a/source/blender/compositor/operations/COM_MixValueOperation.cpp b/source/blender/compositor/operations/COM_MixValueOperation.cpp
index 8c43bb6af8c..f680692f529 100644
--- a/source/blender/compositor/operations/COM_MixValueOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixValueOperation.cpp
@@ -28,6 +28,7 @@ extern "C" {
 
 MixValueOperation::MixValueOperation(): MixBaseOperation()
 {
+	/* pass */
 }
 
 void MixValueOperation::executePixel(float *outputValue, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
diff --git a/source/blender/compositor/operations/COM_NormalizeOperation.cpp b/source/blender/compositor/operations/COM_NormalizeOperation.cpp
index 4dd94943f4e..df382547f13 100644
--- a/source/blender/compositor/operations/COM_NormalizeOperation.cpp
+++ b/source/blender/compositor/operations/COM_NormalizeOperation.cpp
@@ -110,4 +110,5 @@ void *NormalizeOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBu
 
 void NormalizeOperation::deinitializeTileData(rcti *rect, MemoryBuffer **memoryBuffers, void *data)
 {
+	/* pass */
 }
diff --git a/source/blender/compositor/operations/COM_TonemapOperation.cpp b/source/blender/compositor/operations/COM_TonemapOperation.cpp
index b281fb938fd..412cdbdf661 100644
--- a/source/blender/compositor/operations/COM_TonemapOperation.cpp
+++ b/source/blender/compositor/operations/COM_TonemapOperation.cpp
@@ -156,4 +156,5 @@ void *TonemapOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuff
 
 void TonemapOperation::deinitializeTileData(rcti *rect, MemoryBuffer **memoryBuffers, void *data)
 {
+	/* pass */
 }