style cleanup: compositor, pointer syntax, function brace placement, line length

128 files changed, 418 insertions, 276 deletions

diff --git a/source/blender/compositor/nodes/COM_AlphaOverNode.cpp b/source/blender/compositor/nodes/COM_AlphaOverNode.cpp
index 23acaee7b93..0037480d2e9 100644
--- a/source/blender/compositor/nodes/COM_AlphaOverNode.cpp
+++ b/source/blender/compositor/nodes/COM_AlphaOverNode.cpp
@@ -31,15 +31,16 @@
 #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);
 	InputSocket *color2Socket = this->getInputSocket(2);
 	OutputSocket *outputSocket = this->getOutputSocket(0);
-	bNode* editorNode = this->getbNode();
+	bNode *editorNode = this->getbNode();
 	
 	MixBaseOperation *convertProg;
-	NodeTwoFloats *ntf= (NodeTwoFloats*)editorNode->storage;
+	NodeTwoFloats *ntf = (NodeTwoFloats*)editorNode->storage;
 	if (ntf->x!= 0.0f) {
 		AlphaOverMixedOperation *mixOperation  = new AlphaOverMixedOperation();
 		mixOperation->setX(ntf->x);
diff --git a/source/blender/compositor/nodes/COM_AlphaOverNode.h b/source/blender/compositor/nodes/COM_AlphaOverNode.h
index b9840f89d3a..64f78e76837 100644
--- a/source/blender/compositor/nodes/COM_AlphaOverNode.h
+++ b/source/blender/compositor/nodes/COM_AlphaOverNode.h
@@ -31,7 +31,7 @@
   */
 class AlphaOverNode: public Node {
 public:
-	AlphaOverNode(bNode* editorNode) :Node(editorNode) {}
+	AlphaOverNode(bNode *editorNode) :Node(editorNode) {}
 	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
diff --git a/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp b/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
index 5302fb01f1c..436d92df7f8 100644
--- a/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
+++ b/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
@@ -26,10 +26,12 @@
 #include "COM_ExecutionSystem.h"
 #include "COM_BilateralBlurOperation.h"
 
-BilateralBlurNode::BilateralBlurNode(bNode *editorNode): Node(editorNode) {
+BilateralBlurNode::BilateralBlurNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-void BilateralBlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void BilateralBlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
 	NodeBilateralBlurData *data = (NodeBilateralBlurData*)this->getbNode()->storage;
 	BilateralBlurOperation *operation = new BilateralBlurOperation();
 	operation->setQuality(context->getQuality());
diff --git a/source/blender/compositor/nodes/COM_BilateralBlurNode.h b/source/blender/compositor/nodes/COM_BilateralBlurNode.h
index d5d9b7367a4..a92de0eaa62 100644
--- a/source/blender/compositor/nodes/COM_BilateralBlurNode.h
+++ b/source/blender/compositor/nodes/COM_BilateralBlurNode.h
@@ -32,7 +32,7 @@
 class BilateralBlurNode: public Node {
 public:
 	BilateralBlurNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_BlurNode.cpp b/source/blender/compositor/nodes/COM_BlurNode.cpp
index 5e29650a5ca..789a6a6eee2 100644
--- a/source/blender/compositor/nodes/COM_BlurNode.cpp
+++ b/source/blender/compositor/nodes/COM_BlurNode.cpp
@@ -29,11 +29,13 @@
 #include "COM_GaussianBokehBlurOperation.h"
 #include "COM_FastGaussianBlurOperation.h"
 
-BlurNode::BlurNode(bNode *editorNode): Node(editorNode) {
+BlurNode::BlurNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-void BlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
-	bNode* editorNode = this->getbNode();
+void BlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
+	bNode *editorNode = this->getbNode();
 	NodeBlurData * data = (NodeBlurData*)editorNode->storage;
 #if 0
 	const bNodeSocket *sock = this->getInputSocket(1)->getbNodeSocket();
diff --git a/source/blender/compositor/nodes/COM_BlurNode.h b/source/blender/compositor/nodes/COM_BlurNode.h
index 087e2be208f..04a680c32cf 100644
--- a/source/blender/compositor/nodes/COM_BlurNode.h
+++ b/source/blender/compositor/nodes/COM_BlurNode.h
@@ -33,7 +33,7 @@
 class BlurNode: public Node {
 public:
 	BlurNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_BokehBlurNode.cpp b/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
index 68e9b067f07..9e80d024bd2 100644
--- a/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
+++ b/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
@@ -30,11 +30,13 @@
 #include "COM_VariableSizeBokehBlurOperation.h"
 #include "COM_ConvertDepthToRadiusOperation.h"
 
-BokehBlurNode::BokehBlurNode(bNode *editorNode): Node(editorNode) {
+BokehBlurNode::BokehBlurNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-void BokehBlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
-	Object* camob = context->getScene()->camera;
+void BokehBlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
+	Object *camob = context->getScene()->camera;
 
 	if (this->getInputSocket(2)->isConnected()) {
 		VariableSizeBokehBlurOperation *operation = new VariableSizeBokehBlurOperation();
diff --git a/source/blender/compositor/nodes/COM_BokehBlurNode.h b/source/blender/compositor/nodes/COM_BokehBlurNode.h
index cb9d117c8ae..eb9fada5112 100644
--- a/source/blender/compositor/nodes/COM_BokehBlurNode.h
+++ b/source/blender/compositor/nodes/COM_BokehBlurNode.h
@@ -33,7 +33,7 @@
 class BokehBlurNode: public Node {
 public:
 	BokehBlurNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_BokehImageNode.cpp b/source/blender/compositor/nodes/COM_BokehImageNode.cpp
index 511727636b5..35511d213f5 100644
--- a/source/blender/compositor/nodes/COM_BokehImageNode.cpp
+++ b/source/blender/compositor/nodes/COM_BokehImageNode.cpp
@@ -25,10 +25,12 @@
 #include "COM_BokehImageOperation.h"
 #include "COM_ExecutionSystem.h"
 
-BokehImageNode::BokehImageNode(bNode *editorNode): Node(editorNode) {
+BokehImageNode::BokehImageNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-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);
diff --git a/source/blender/compositor/nodes/COM_BokehImageNode.h b/source/blender/compositor/nodes/COM_BokehImageNode.h
index f3322077c47..d4fabf0e516 100644
--- a/source/blender/compositor/nodes/COM_BokehImageNode.h
+++ b/source/blender/compositor/nodes/COM_BokehImageNode.h
@@ -32,7 +32,7 @@
 class BokehImageNode: public Node {
 public:
 	BokehImageNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_BoxMaskNode.cpp b/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
index 7f904f1acc0..322b5893096 100644
--- a/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
+++ b/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
@@ -25,10 +25,12 @@
 #include "COM_BoxMaskOperation.h"
 #include "COM_ExecutionSystem.h"
 
-BoxMaskNode::BoxMaskNode(bNode *editorNode): Node(editorNode) {
+BoxMaskNode::BoxMaskNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-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);
diff --git a/source/blender/compositor/nodes/COM_BoxMaskNode.h b/source/blender/compositor/nodes/COM_BoxMaskNode.h
index c91730fdbb8..c71c6a18388 100644
--- a/source/blender/compositor/nodes/COM_BoxMaskNode.h
+++ b/source/blender/compositor/nodes/COM_BoxMaskNode.h
@@ -32,7 +32,7 @@
 class BoxMaskNode: public Node {
 public:
 	BoxMaskNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_BrightnessNode.cpp b/source/blender/compositor/nodes/COM_BrightnessNode.cpp
index 3ff5538f13e..2bcf7250173 100644
--- a/source/blender/compositor/nodes/COM_BrightnessNode.cpp
+++ b/source/blender/compositor/nodes/COM_BrightnessNode.cpp
@@ -25,10 +25,12 @@
 #include "COM_BrightnessOperation.h"
 #include "COM_ExecutionSystem.h"
 
-BrightnessNode::BrightnessNode(bNode *editorNode): Node(editorNode) {
+BrightnessNode::BrightnessNode(bNode *editorNode): Node(editorNode)
+{
 }
 /// @todo: add anti alias when not FSA
-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));
diff --git a/source/blender/compositor/nodes/COM_BrightnessNode.h b/source/blender/compositor/nodes/COM_BrightnessNode.h
index 8f1c9ccda86..4c3b6421322 100644
--- a/source/blender/compositor/nodes/COM_BrightnessNode.h
+++ b/source/blender/compositor/nodes/COM_BrightnessNode.h
@@ -32,7 +32,7 @@
 class BrightnessNode: public Node {
 public:
 	BrightnessNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp b/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
index 9ab6c6250db..08980de8d98 100644
--- a/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
+++ b/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
@@ -30,13 +30,14 @@
 ChannelMatteNode::ChannelMatteNode(bNode *editorNode): Node(editorNode)
 {}
 
-void ChannelMatteNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context) {
+void ChannelMatteNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
+{
 	InputSocket *inputSocketImage = this->getInputSocket(0);
 	OutputSocket *outputSocketImage = this->getOutputSocket(0);
 	OutputSocket *outputSocketMatte = this->getOutputSocket(1);
 
 	NodeOperation *convert=NULL;
-	bNode* node = this->getbNode();
+	bNode *node = this->getbNode();
 
 	/* colorspace */
 	switch (node->custom1) {
diff --git a/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp b/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
index 36d315c3a4b..45176cb007c 100644
--- a/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
+++ b/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
@@ -28,7 +28,8 @@
 ChromaMatteNode::ChromaMatteNode(bNode *editorNode): Node(editorNode)
 {}
 
-void ChromaMatteNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context) {
+void ChromaMatteNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
+{
 	InputSocket *inputSocketImage = this->getInputSocket(0);
 	InputSocket *inputSocketKey = this->getInputSocket(1);
 	OutputSocket *outputSocketImage = this->getOutputSocket(0);
@@ -40,7 +41,7 @@ void ChromaMatteNode::convertToOperations(ExecutionSystem *graph, CompositorCont
 	operationRGBToYCC_Key->setMode(0); /* BLI_YCC_ITU_BT601 */
 
 	ChromaMatteOperation *operation = new ChromaMatteOperation();
-	bNode* editorsnode = getbNode();
+	bNode *editorsnode = getbNode();
 	operation->setSettings((NodeChroma*)editorsnode->storage);
 
 	inputSocketImage->relinkConnections(operationRGBToYCC_Image->getInputSocket(0), true, 0, graph);
diff --git a/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp b/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
index 8d5e8a2788e..32c9e50874e 100644
--- a/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
+++ b/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
@@ -27,19 +27,20 @@
 #include "BKE_node.h"
 #include "COM_MixBlendOperation.h"
 
-ColorBalanceNode::ColorBalanceNode(bNode* editorNode): Node(editorNode)
+ColorBalanceNode::ColorBalanceNode(bNode *editorNode): Node(editorNode)
 {
 }
-void ColorBalanceNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void ColorBalanceNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
 	InputSocket *inputSocket = this->getInputSocket(0);
 	InputSocket *inputImageSocket = this->getInputSocket(1);
 	OutputSocket *outputSocket = this->getOutputSocket(0);
 	
-	bNode* node = this->getbNode();
-	NodeColorBalance *n= (NodeColorBalance *)node->storage;
+	bNode *node = this->getbNode();
+	NodeColorBalance *n = (NodeColorBalance *)node->storage;
 	NodeOperation*operation;
 	if (node->custom1 == 0) {
-		ColorBalanceLGGOperation* operationLGG = new ColorBalanceLGGOperation();
+		ColorBalanceLGGOperation *operationLGG = new ColorBalanceLGGOperation();
 		{
 				int c;
 	
diff --git a/source/blender/compositor/nodes/COM_ColorBalanceNode.h b/source/blender/compositor/nodes/COM_ColorBalanceNode.h
index 6de431a764f..61a09d28c01 100644
--- a/source/blender/compositor/nodes/COM_ColorBalanceNode.h
+++ b/source/blender/compositor/nodes/COM_ColorBalanceNode.h
@@ -32,8 +32,8 @@
 class ColorBalanceNode : public Node
 {
 public:
-	ColorBalanceNode(bNode* editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	ColorBalanceNode(bNode *editorNode);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
 };
 
 #endif // COM_ColorBalanceNODE_H
diff --git a/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp b/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp
index ac3e1285e75..995d66fcf23 100644
--- a/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp
+++ b/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp
@@ -25,12 +25,14 @@
 #include "COM_ColorCorrectionOperation.h"
 #include "COM_ExecutionSystem.h"
 
-ColorCorrectionNode::ColorCorrectionNode(bNode *editorNode): Node(editorNode) {
+ColorCorrectionNode::ColorCorrectionNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-void ColorCorrectionNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void ColorCorrectionNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
 	ColorCorrectionOperation *operation = new ColorCorrectionOperation();
-	bNode* editorNode = getbNode();
+	bNode *editorNode = getbNode();
 	this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0),true, 0, graph);
 	this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1),true, 1, graph);
 	this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
diff --git a/source/blender/compositor/nodes/COM_ColorCorrectionNode.h b/source/blender/compositor/nodes/COM_ColorCorrectionNode.h
index e5c35476931..46b7fe5e0bc 100644
--- a/source/blender/compositor/nodes/COM_ColorCorrectionNode.h
+++ b/source/blender/compositor/nodes/COM_ColorCorrectionNode.h
@@ -32,7 +32,7 @@
 class ColorCorrectionNode: public Node {
 public:
 	ColorCorrectionNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_ColorCurveNode.cpp b/source/blender/compositor/nodes/COM_ColorCurveNode.cpp
index 55837a35b59..a96fdf72b11 100644
--- a/source/blender/compositor/nodes/COM_ColorCurveNode.cpp
+++ b/source/blender/compositor/nodes/COM_ColorCurveNode.cpp
@@ -25,10 +25,12 @@
 #include "COM_ColorCurveOperation.h"
 #include "COM_ExecutionSystem.h"
 
-ColorCurveNode::ColorCurveNode(bNode *editorNode): Node(editorNode) {
+ColorCurveNode::ColorCurveNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-void ColorCurveNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void ColorCurveNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
 	ColorCurveOperation *operation = new ColorCurveOperation();
 
 	this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, graph);
diff --git a/source/blender/compositor/nodes/COM_ColorCurveNode.h b/source/blender/compositor/nodes/COM_ColorCurveNode.h
index aade20860c2..264e2691566 100644
--- a/source/blender/compositor/nodes/COM_ColorCurveNode.h
+++ b/source/blender/compositor/nodes/COM_ColorCurveNode.h
@@ -32,7 +32,7 @@
 class ColorCurveNode: public Node {
 public:
 	ColorCurveNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_ColorMatteNode.cpp b/source/blender/compositor/nodes/COM_ColorMatteNode.cpp
index fa00c95f50b..e5231a48e05 100644
--- a/source/blender/compositor/nodes/COM_ColorMatteNode.cpp
+++ b/source/blender/compositor/nodes/COM_ColorMatteNode.cpp
@@ -28,7 +28,8 @@
 ColorMatteNode::ColorMatteNode(bNode *editorNode): Node(editorNode)
 {}
 
-void ColorMatteNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context) {
+void ColorMatteNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
+{
 	InputSocket *inputSocketImage = this->getInputSocket(0);
 	InputSocket *inputSocketKey = this->getInputSocket(1);
 	OutputSocket *outputSocketImage = this->getOutputSocket(0);
@@ -38,7 +39,7 @@ void ColorMatteNode::convertToOperations(ExecutionSystem *graph, CompositorConte
 	ConvertRGBToHSVOperation *operationRGBToHSV_Key = new ConvertRGBToHSVOperation();
 
 	ColorMatteOperation *operation = new ColorMatteOperation();
-	bNode* editorsnode = getbNode();
+	bNode *editorsnode = getbNode();
 	operation->setSettings((NodeChroma*)editorsnode->storage);
 
 	inputSocketImage->relinkConnections(operationRGBToHSV_Image->getInputSocket(0), true, 0, graph);
diff --git a/source/blender/compositor/nodes/COM_ColorNode.cpp b/source/blender/compositor/nodes/COM_ColorNode.cpp
index 0eee305a7e6..f5fcb0177f7 100644
--- a/source/blender/compositor/nodes/COM_ColorNode.cpp
+++ b/source/blender/compositor/nodes/COM_ColorNode.cpp
@@ -25,12 +25,14 @@
 #include "COM_SetColorOperation.h"
 #include "COM_ExecutionSystem.h"
 
-ColorNode::ColorNode(bNode *editorNode): Node(editorNode) {
+ColorNode::ColorNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-void ColorNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void ColorNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
 	SetColorOperation *operation = new SetColorOperation();
-	bNodeSocket* socket = this->getEditorOutputSocket(0);
+	bNodeSocket *socket = this->getEditorOutputSocket(0);
 	bNodeSocketValueRGBA *dval = (bNodeSocketValueRGBA*)socket->default_value;
 	this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket());
 	operation->setChannels(dval->value);
diff --git a/source/blender/compositor/nodes/COM_ColorNode.h b/source/blender/compositor/nodes/COM_ColorNode.h
index 6a9f3062676..937979dd961 100644
--- a/source/blender/compositor/nodes/COM_ColorNode.h
+++ b/source/blender/compositor/nodes/COM_ColorNode.h
@@ -32,7 +32,7 @@
 class ColorNode: public Node {
 public:
 	ColorNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_ColorRampNode.cpp b/source/blender/compositor/nodes/COM_ColorRampNode.cpp
index bd1b3b5a35e..1873cad5d57 100644
--- a/source/blender/compositor/nodes/COM_ColorRampNode.cpp
+++ b/source/blender/compositor/nodes/COM_ColorRampNode.cpp
@@ -27,16 +27,17 @@
 #include "COM_SeparateChannelOperation.h"
 #include "DNA_texture_types.h"
 
-ColorRampNode::ColorRampNode(bNode* editorNode): Node(editorNode)
+ColorRampNode::ColorRampNode(bNode *editorNode): Node(editorNode)
 {}
 
-void ColorRampNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void ColorRampNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
 	InputSocket *inputSocket = this->getInputSocket(0);
 	OutputSocket *outputSocket = this->getOutputSocket(0);
 	OutputSocket *outputSocketAlpha = this->getOutputSocket(1);
-	bNode* editorNode = this->getbNode();
+	bNode *editorNode = this->getbNode();
 
-	ColorRampOperation * operation = new ColorRampOperation();
+	ColorRampOperation *operation = new ColorRampOperation();
 	outputSocket->relinkConnections(operation->getOutputSocket(0));
 	if (outputSocketAlpha->isConnected()) {
 		SeparateChannelOperation *operation2 = new SeparateChannelOperation();
diff --git a/source/blender/compositor/nodes/COM_ColorRampNode.h b/source/blender/compositor/nodes/COM_ColorRampNode.h
index de0f2a5395e..53fff2b0d98 100644
--- a/source/blender/compositor/nodes/COM_ColorRampNode.h
+++ b/source/blender/compositor/nodes/COM_ColorRampNode.h
@@ -32,8 +32,8 @@
 class ColorRampNode : public Node
 {
 public:
-	ColorRampNode(bNode* editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	ColorRampNode(bNode *editorNode);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif // COM_ColorRampNODE_H
diff --git a/source/blender/compositor/nodes/COM_ColorSpillNode.cpp b/source/blender/compositor/nodes/COM_ColorSpillNode.cpp
index 5935167d88e..88043653b4f 100644
--- a/source/blender/compositor/nodes/COM_ColorSpillNode.cpp
+++ b/source/blender/compositor/nodes/COM_ColorSpillNode.cpp
@@ -27,12 +27,13 @@
 ColorSpillNode::ColorSpillNode(bNode *editorNode): Node(editorNode)
 {}
 
-void ColorSpillNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context) {
+void ColorSpillNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
+{
 	InputSocket *inputSocketImage = this->getInputSocket(0);
 	InputSocket *inputSocketFac = this->getInputSocket(1);
 	OutputSocket *outputSocketImage = this->getOutputSocket(0);
 
-	bNode* editorsnode = getbNode();
+	bNode *editorsnode = getbNode();
 
 	
 	ColorSpillOperation *operation;
diff --git a/source/blender/compositor/nodes/COM_ColorToBWNode.cpp b/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
index a58c2e9fd19..7ff7ee1c13e 100644
--- a/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
+++ b/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
@@ -25,10 +25,12 @@
 #include "COM_ConvertColorToBWOperation.h"
 #include "COM_ExecutionSystem.h"
 
-ColourToBWNode::ColourToBWNode(bNode *editorNode): Node(editorNode) {
+ColourToBWNode::ColourToBWNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-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 bd43f207fc7..a0f46ad6b6c 100644
--- a/source/blender/compositor/nodes/COM_CombineHSVANode.cpp
+++ b/source/blender/compositor/nodes/COM_CombineHSVANode.cpp
@@ -28,10 +28,12 @@
 #include "COM_SetValueOperation.h"
 #include "COM_ConvertHSVToRGBOperation.h"
 
-CombineHSVANode::CombineHSVANode(bNode *editorNode): CombineRGBANode(editorNode) {
+CombineHSVANode::CombineHSVANode(bNode *editorNode): CombineRGBANode(editorNode)
+{
 }
 
-void CombineHSVANode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void CombineHSVANode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
 	ConvertHSVToRGBOperation *operation = new ConvertHSVToRGBOperation();
 	OutputSocket *outputSocket = this->getOutputSocket(0);
 	if (outputSocket->isConnected()) {
diff --git a/source/blender/compositor/nodes/COM_CombineRGBANode.cpp b/source/blender/compositor/nodes/COM_CombineRGBANode.cpp
index 6bef0441e5e..d5fef1e756a 100644
--- a/source/blender/compositor/nodes/COM_CombineRGBANode.cpp
+++ b/source/blender/compositor/nodes/COM_CombineRGBANode.cpp
@@ -29,11 +29,13 @@
 #include "DNA_material_types.h" // the ramp types
 
 
-CombineRGBANode::CombineRGBANode(bNode *editorNode): Node(editorNode) {
+CombineRGBANode::CombineRGBANode(bNode *editorNode): Node(editorNode)
+{
 }
 
 
-void CombineRGBANode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void CombineRGBANode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
 	InputSocket *inputRSocket = this->getInputSocket(0);
 	InputSocket *inputGSocket = this->getInputSocket(1);
 	InputSocket *inputBSocket = this->getInputSocket(2);
diff --git a/source/blender/compositor/nodes/COM_CombineYCCANode.cpp b/source/blender/compositor/nodes/COM_CombineYCCANode.cpp
index bf31daf5852..ad6203ea85a 100644
--- a/source/blender/compositor/nodes/COM_CombineYCCANode.cpp
+++ b/source/blender/compositor/nodes/COM_CombineYCCANode.cpp
@@ -22,10 +22,12 @@
 #include "COM_CombineYCCANode.h"
 #include "COM_ConvertYCCToRGBOperation.h"
 
-CombineYCCANode::CombineYCCANode(bNode *editorNode): CombineRGBANode(editorNode) {
+CombineYCCANode::CombineYCCANode(bNode *editorNode): CombineRGBANode(editorNode)
+{
 }
 
-void CombineYCCANode::convertToOperations(ExecutionSystem *graph, CompositorContext *context) {
+void CombineYCCANode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
+{
 	ConvertYCCToRGBOperation *operation = new ConvertYCCToRGBOperation();
 	OutputSocket *outputSocket = this->getOutputSocket(0);
 
diff --git a/source/blender/compositor/nodes/COM_CombineYUVANode.cpp b/source/blender/compositor/nodes/COM_CombineYUVANode.cpp
index 3348eacc86f..ea92a40f803 100644
--- a/source/blender/compositor/nodes/COM_CombineYUVANode.cpp
+++ b/source/blender/compositor/nodes/COM_CombineYUVANode.cpp
@@ -22,10 +22,12 @@
 #include "COM_CombineYUVANode.h"
 #include "COM_ConvertYUVToRGBOperation.h"
 
-CombineYUVANode::CombineYUVANode(bNode *editorNode): CombineRGBANode(editorNode) {
+CombineYUVANode::CombineYUVANode(bNode *editorNode): CombineRGBANode(editorNode)
+{
 }
 
-void CombineYUVANode::convertToOperations(ExecutionSystem *graph, CompositorContext *context) {
+void CombineYUVANode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
+{
 	ConvertYUVToRGBOperation *operation = new ConvertYUVToRGBOperation();
 	OutputSocket *outputSocket = this->getOutputSocket(0);
 	if (outputSocket->isConnected()) {
diff --git a/source/blender/compositor/nodes/COM_CompositorNode.cpp b/source/blender/compositor/nodes/COM_CompositorNode.cpp
index 95db41b322c..57821e7fe27 100644
--- a/source/blender/compositor/nodes/COM_CompositorNode.cpp
+++ b/source/blender/compositor/nodes/COM_CompositorNode.cpp
@@ -24,10 +24,12 @@
 #include "COM_CompositorOperation.h"
 #include "COM_ExecutionSystem.h"
 
-CompositorNode::CompositorNode(bNode *editorNode): Node(editorNode) {
+CompositorNode::CompositorNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-void CompositorNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void CompositorNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
 	InputSocket *imageSocket = this->getInputSocket(0);
 	InputSocket *alphaSocket = this->getInputSocket(1);
 	if (imageSocket->isConnected()) {
diff --git a/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp b/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
index 775fa1ad0fd..94139c132fb 100644
--- a/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
+++ b/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
@@ -24,9 +24,10 @@
 #include "COM_ConvertKeyToPremulOperation.h"
 #include "COM_ExecutionSystem.h"
 
-void ConvertAlphaNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
-	NodeOperation* operation = NULL;
-	bNode* node = this->getbNode();
+void ConvertAlphaNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
+	NodeOperation *operation = NULL;
+	bNode *node = this->getbNode();
 
 	/* value hardcoded in rna_nodetree.c */
 	if (node->custom1 == 1) {
diff --git a/source/blender/compositor/nodes/COM_ConvertAlphaNode.h b/source/blender/compositor/nodes/COM_ConvertAlphaNode.h
index 04834a45c45..2e3fe743f4e 100644
--- a/source/blender/compositor/nodes/COM_ConvertAlphaNode.h
+++ b/source/blender/compositor/nodes/COM_ConvertAlphaNode.h
@@ -30,7 +30,7 @@
   */
 class ConvertAlphaNode: public Node {
 public:
-	ConvertAlphaNode(bNode* editorNode) :Node(editorNode) {}
+	ConvertAlphaNode(bNode *editorNode) :Node(editorNode) {}
 	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
diff --git a/source/blender/compositor/nodes/COM_CropNode.cpp b/source/blender/compositor/nodes/COM_CropNode.cpp
index 9d48922d0d6..52329be3034 100644
--- a/source/blender/compositor/nodes/COM_CropNode.cpp
+++ b/source/blender/compositor/nodes/COM_CropNode.cpp
@@ -24,11 +24,13 @@
 #include "COM_CropOperation.h"
 
 
-CropNode::CropNode(bNode *editorNode) : Node(editorNode) {
+CropNode::CropNode(bNode *editorNode) : Node(editorNode)
+{
 }
 
-void CropNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
-	bNode* node = getbNode();
+void CropNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
+	bNode *node = getbNode();
 	NodeTwoXYs *cropSettings = (NodeTwoXYs*)node->storage;
 	bool relative = (bool)node->custom2;
 	bool cropImage = (bool)node->custom1;
diff --git a/source/blender/compositor/nodes/COM_CropNode.h b/source/blender/compositor/nodes/COM_CropNode.h
index a39bd47f22a..0bdfffc8fec 100644
--- a/source/blender/compositor/nodes/COM_CropNode.h
+++ b/source/blender/compositor/nodes/COM_CropNode.h
@@ -28,7 +28,7 @@
 class CropNode: public Node {
 public:
 	CropNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_DefocusNode.cpp b/source/blender/compositor/nodes/COM_DefocusNode.cpp
index 40adc3793b0..77f7baaef98 100644
--- a/source/blender/compositor/nodes/COM_DefocusNode.cpp
+++ b/source/blender/compositor/nodes/COM_DefocusNode.cpp
@@ -33,16 +33,18 @@
 #include "COM_SetValueOperation.h"
 #include "COM_GammaCorrectOperation.h"
 
-DefocusNode::DefocusNode(bNode *editorNode): Node(editorNode) {
+DefocusNode::DefocusNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-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;
+	Scene *scene = (Scene*)node->id;
+	Object *camob = (scene)? scene->camera: NULL;
 	NodeDefocus *data = (NodeDefocus*)node->storage;
 
-	NodeOperation* radiusOperation;
+	NodeOperation *radiusOperation;
 	if (data->no_zbuf) {
 		MathMultiplyOperation *multiply = new MathMultiplyOperation();
 		SetValueOperation *multiplier = new SetValueOperation();
diff --git a/source/blender/compositor/nodes/COM_DefocusNode.h b/source/blender/compositor/nodes/COM_DefocusNode.h
index 3d2ff7eb4de..d52ee3da77b 100644
--- a/source/blender/compositor/nodes/COM_DefocusNode.h
+++ b/source/blender/compositor/nodes/COM_DefocusNode.h
@@ -33,7 +33,7 @@
 class DefocusNode: public Node {
 public:
 	DefocusNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp b/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp
index 8327813cf05..ab6917f3a59 100644
--- a/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp
+++ b/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp
@@ -25,15 +25,16 @@
 #include "COM_DifferenceMatteOperation.h"
 #include "COM_SetAlphaOperation.h"
 
-DifferenceMatteNode::DifferenceMatteNode(bNode* editorNode): Node(editorNode)
+DifferenceMatteNode::DifferenceMatteNode(bNode *editorNode): Node(editorNode)
 {}
 
-void DifferenceMatteNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void DifferenceMatteNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
 	InputSocket *inputSocket = this->getInputSocket(0);
 	InputSocket *inputSocket2 = this->getInputSocket(1);
 	OutputSocket *outputSocketImage = this->getOutputSocket(0);
 	OutputSocket *outputSocketMatte = this->getOutputSocket(1);
-	bNode* editorNode = this->getbNode();
+	bNode *editorNode = this->getbNode();
 
 	DifferenceMatteOperation * operationSet = new DifferenceMatteOperation();
 	operationSet->setSettings((NodeChroma*)editorNode->storage);
diff --git a/source/blender/compositor/nodes/COM_DifferenceMatteNode.h b/source/blender/compositor/nodes/COM_DifferenceMatteNode.h
index 2adce752f49..3b270ebc3b7 100644
--- a/source/blender/compositor/nodes/COM_DifferenceMatteNode.h
+++ b/source/blender/compositor/nodes/COM_DifferenceMatteNode.h
@@ -32,8 +32,8 @@
 class DifferenceMatteNode : public Node
 {
 public:
-	DifferenceMatteNode(bNode* editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	DifferenceMatteNode(bNode *editorNode);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif // COM_DifferenceMatteNODE_H
diff --git a/source/blender/compositor/nodes/COM_DilateErodeNode.cpp b/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
index 185eb6475bf..2118f5b8e47 100644
--- a/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
+++ b/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
@@ -27,11 +27,13 @@
 #include "COM_AntiAliasOperation.h"
 #include "BLI_math.h"
 
-DilateErodeNode::DilateErodeNode(bNode *editorNode): Node(editorNode) {
+DilateErodeNode::DilateErodeNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-void DilateErodeNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
-	bNode* editorNode = this->getbNode();
+void DilateErodeNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
+	bNode *editorNode = this->getbNode();
 	DilateErodeOperation *operation = new DilateErodeOperation();
 	operation->setDistance(editorNode->custom2);
 	operation->setInset(2.0f);
diff --git a/source/blender/compositor/nodes/COM_DilateErodeNode.h b/source/blender/compositor/nodes/COM_DilateErodeNode.h
index 1ebf7e0b4c8..496bd0203dd 100644
--- a/source/blender/compositor/nodes/COM_DilateErodeNode.h
+++ b/source/blender/compositor/nodes/COM_DilateErodeNode.h
@@ -32,7 +32,7 @@
 class DilateErodeNode: public Node {
 public:
 	DilateErodeNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp b/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
index ef3e4918048..cefeffcfc07 100644
--- a/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
+++ b/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
@@ -26,10 +26,12 @@
 #include "COM_ExecutionSystem.h"
 #include "COM_DirectionalBlurOperation.h"
 
-DirectionalBlurNode::DirectionalBlurNode(bNode *editorNode): Node(editorNode) {
+DirectionalBlurNode::DirectionalBlurNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-void DirectionalBlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void DirectionalBlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
 	NodeDBlurData *data = (NodeDBlurData*)this->getbNode()->storage;
 	DirectionalBlurOperation *operation = new DirectionalBlurOperation();
 	operation->setQuality(context->getQuality());
diff --git a/source/blender/compositor/nodes/COM_DirectionalBlurNode.h b/source/blender/compositor/nodes/COM_DirectionalBlurNode.h
index 842e330d6d0..1cf36fdeae7 100644
--- a/source/blender/compositor/nodes/COM_DirectionalBlurNode.h
+++ b/source/blender/compositor/nodes/COM_DirectionalBlurNode.h
@@ -32,7 +32,7 @@
 class DirectionalBlurNode: public Node {
 public:
 	DirectionalBlurNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_DisplaceNode.cpp b/source/blender/compositor/nodes/COM_DisplaceNode.cpp
index ff5dd413468..5fe9591bfd4 100644
--- a/source/blender/compositor/nodes/COM_DisplaceNode.cpp
+++ b/source/blender/compositor/nodes/COM_DisplaceNode.cpp
@@ -24,7 +24,8 @@
 #include "COM_DisplaceSimpleOperation.h"
 #include "COM_ExecutionSystem.h"
 
-DisplaceNode::DisplaceNode(bNode *editorNode): Node(editorNode) {
+DisplaceNode::DisplaceNode(bNode *editorNode): Node(editorNode)
+{
 }
 
 void DisplaceNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
diff --git a/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp b/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
index c55ce803f97..3fc4a882eaf 100644
--- a/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
+++ b/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
@@ -27,14 +27,15 @@
 DistanceMatteNode::DistanceMatteNode(bNode *editorNode): Node(editorNode)
 {}
 
-void DistanceMatteNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context) {
+void DistanceMatteNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
+{
 	InputSocket *inputSocketImage = this->getInputSocket(0);
 	InputSocket *inputSocketKey = this->getInputSocket(1);
 	OutputSocket *outputSocketImage = this->getOutputSocket(0);
 	OutputSocket *outputSocketMatte = this->getOutputSocket(1);
 
 	DistanceMatteOperation *operation = new DistanceMatteOperation();
-	bNode* editorsnode = getbNode();
+	bNode *editorsnode = getbNode();
 	operation->setSettings((NodeChroma*)editorsnode->storage);
 
 	inputSocketImage->relinkConnections(operation->getInputSocket(0), true, 0, graph);
diff --git a/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp b/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp
index f1ec4ab9b23..1ac273a52cb 100644
--- a/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp
+++ b/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp
@@ -25,12 +25,14 @@
 #include "DNA_scene_types.h"
 #include "COM_ExecutionSystem.h"
 
-DoubleEdgeMaskNode::DoubleEdgeMaskNode(bNode *editorNode): Node(editorNode) {
+DoubleEdgeMaskNode::DoubleEdgeMaskNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-void DoubleEdgeMaskNode::convertToOperations(ExecutionSystem *system, CompositorContext * context) {
+void DoubleEdgeMaskNode::convertToOperations(ExecutionSystem *system, CompositorContext * context)
+{
 	DoubleEdgeMaskOperation *operation;
-	bNode* bnode = this->getbNode();
+	bNode *bnode = this->getbNode();
 	
 	operation = new DoubleEdgeMaskOperation();
 	operation->setAdjecentOnly(bnode->custom1);
diff --git a/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.h b/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.h
index 26d553a1422..2c52e988946 100644
--- a/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.h
+++ b/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.h
@@ -32,7 +32,7 @@
 class DoubleEdgeMaskNode: public Node {
 public:
 	DoubleEdgeMaskNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp b/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp
index 89996f0e590..7e327a306b6 100644
--- a/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp
+++ b/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp
@@ -25,10 +25,12 @@
 #include "COM_EllipseMaskOperation.h"
 #include "COM_ExecutionSystem.h"
 
-EllipseMaskNode::EllipseMaskNode(bNode *editorNode): Node(editorNode) {
+EllipseMaskNode::EllipseMaskNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-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);
diff --git a/source/blender/compositor/nodes/COM_EllipseMaskNode.h b/source/blender/compositor/nodes/COM_EllipseMaskNode.h
index 4fecf6946cc..be6956e30b5 100644
--- a/source/blender/compositor/nodes/COM_EllipseMaskNode.h
+++ b/source/blender/compositor/nodes/COM_EllipseMaskNode.h
@@ -32,7 +32,7 @@
 class EllipseMaskNode: public Node {
 public:
 	EllipseMaskNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_FilterNode.cpp b/source/blender/compositor/nodes/COM_FilterNode.cpp
index f10d0391317..a1d405c0dff 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)
 {
 }
 
-void FilterNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void FilterNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
 	InputSocket *inputSocket = this->getInputSocket(0);
 	InputSocket *inputImageSocket = this->getInputSocket(1);
 	OutputSocket *outputSocket = this->getOutputSocket(0);
diff --git a/source/blender/compositor/nodes/COM_FilterNode.h b/source/blender/compositor/nodes/COM_FilterNode.h
index c77846ef2fe..080682dcefe 100644
--- a/source/blender/compositor/nodes/COM_FilterNode.h
+++ b/source/blender/compositor/nodes/COM_FilterNode.h
@@ -32,8 +32,8 @@
 class FilterNode : public Node
 {
 public:
-	FilterNode(bNode* editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	FilterNode(bNode *editorNode);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif // COM_FILTERNODE_H
diff --git a/source/blender/compositor/nodes/COM_FlipNode.cpp b/source/blender/compositor/nodes/COM_FlipNode.cpp
index 7fbb21478ec..a4924aaae40 100644
--- a/source/blender/compositor/nodes/COM_FlipNode.cpp
+++ b/source/blender/compositor/nodes/COM_FlipNode.cpp
@@ -25,10 +25,12 @@
 #include "COM_FlipOperation.h"
 #include "COM_ExecutionSystem.h"
 
-FlipNode::FlipNode(bNode *editorNode) : Node(editorNode) {
+FlipNode::FlipNode(bNode *editorNode) : Node(editorNode)
+{
 }
 
-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();
diff --git a/source/blender/compositor/nodes/COM_FlipNode.h b/source/blender/compositor/nodes/COM_FlipNode.h
index 593fed452af..53bcc504f80 100644
--- a/source/blender/compositor/nodes/COM_FlipNode.h
+++ b/source/blender/compositor/nodes/COM_FlipNode.h
@@ -32,7 +32,7 @@
 class FlipNode: public Node {
 public:
 	FlipNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_GammaNode.cpp b/source/blender/compositor/nodes/COM_GammaNode.cpp
index e61f9245f40..e5391e54e72 100644
--- a/source/blender/compositor/nodes/COM_GammaNode.cpp
+++ b/source/blender/compositor/nodes/COM_GammaNode.cpp
@@ -25,10 +25,12 @@
 #include "COM_GammaOperation.h"
 #include "COM_ExecutionSystem.h"
 
-GammaNode::GammaNode(bNode *editorNode): Node(editorNode) {
+GammaNode::GammaNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-void GammaNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void GammaNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
 	GammaOperation *operation = new GammaOperation();
 	
 	this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, graph);
diff --git a/source/blender/compositor/nodes/COM_GammaNode.h b/source/blender/compositor/nodes/COM_GammaNode.h
index 56f2374467d..121d99cbd57 100644
--- a/source/blender/compositor/nodes/COM_GammaNode.h
+++ b/source/blender/compositor/nodes/COM_GammaNode.h
@@ -32,7 +32,7 @@
 class GammaNode: public Node {
 public:
 	GammaNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_GlareNode.cpp b/source/blender/compositor/nodes/COM_GlareNode.cpp
index c0fcad1a5b3..c65adc862b1 100644
--- a/source/blender/compositor/nodes/COM_GlareNode.cpp
+++ b/source/blender/compositor/nodes/COM_GlareNode.cpp
@@ -30,12 +30,14 @@
 #include "COM_SetValueOperation.h"
 #include "COM_MixBlendOperation.h"
 
-GlareNode::GlareNode(bNode *editorNode): Node(editorNode) {
+GlareNode::GlareNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-void GlareNode::convertToOperations(ExecutionSystem *system, CompositorContext * context) {
-	bNode* node = this->getbNode();
-	NodeGlare* glare = (NodeGlare*)node->storage;
+void GlareNode::convertToOperations(ExecutionSystem *system, CompositorContext * context)\
+{
+	bNode *node = this->getbNode();
+	NodeGlare *glare = (NodeGlare*)node->storage;
 	
 	switch (glare->type) {
 	
diff --git a/source/blender/compositor/nodes/COM_GlareNode.h b/source/blender/compositor/nodes/COM_GlareNode.h
index b3e965fa72d..97a75445db7 100644
--- a/source/blender/compositor/nodes/COM_GlareNode.h
+++ b/source/blender/compositor/nodes/COM_GlareNode.h
@@ -32,7 +32,7 @@
 class GlareNode: public Node {
 public:
 	GlareNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_GroupNode.cpp b/source/blender/compositor/nodes/COM_GroupNode.cpp
index 14718909de9..67e829a5cf6 100644
--- a/source/blender/compositor/nodes/COM_GroupNode.cpp
+++ b/source/blender/compositor/nodes/COM_GroupNode.cpp
@@ -24,13 +24,16 @@
 #include "COM_SocketProxyNode.h"
 #include "COM_ExecutionSystemHelper.h"
 
-GroupNode::GroupNode(bNode *editorNode): Node(editorNode) {
+GroupNode::GroupNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-void GroupNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void GroupNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
 }
 
-void GroupNode::ungroup(ExecutionSystem &system) {
+void GroupNode::ungroup(ExecutionSystem &system)
+{
 	vector<InputSocket*> &inputsockets = this->getInputSockets();
 	vector<OutputSocket*> &outputsockets = this->getOutputSockets();
 	unsigned int index;
@@ -65,6 +68,6 @@ void GroupNode::ungroup(ExecutionSystem &system) {
 		}
 	}
 
-	bNodeTree* subtree = (bNodeTree*)this->getbNode()->id;
+	bNodeTree *subtree = (bNodeTree*)this->getbNode()->id;
 	ExecutionSystemHelper::addbNodeTree(system, nodes_start, subtree);
 }
diff --git a/source/blender/compositor/nodes/COM_GroupNode.h b/source/blender/compositor/nodes/COM_GroupNode.h
index a3a46ad2c33..e35c9cbce33 100644
--- a/source/blender/compositor/nodes/COM_GroupNode.h
+++ b/source/blender/compositor/nodes/COM_GroupNode.h
@@ -33,7 +33,7 @@
 class GroupNode: public Node {
 public:
 	GroupNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 
 	/**
 	  * @brief check if this node a group node.
diff --git a/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp b/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
index 88ba24498bb..80c786ef6d7 100644
--- a/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
+++ b/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
@@ -33,14 +33,16 @@
 #include "DNA_node_types.h"
 #include "COM_HueSaturationValueCorrectOperation.h"
 
-HueSaturationValueCorrectNode::HueSaturationValueCorrectNode(bNode *editorNode): Node(editorNode) {
+HueSaturationValueCorrectNode::HueSaturationValueCorrectNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-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();
+	bNode *editorsnode = getbNode();
 	CurveMapping *storage = (CurveMapping*)editorsnode->storage;
 	
 	if (colourSocket->isConnected() && outputSocket->isConnected()) {
diff --git a/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp b/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
index b4b9b55cf8b..d78592884c6 100644
--- a/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
+++ b/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
@@ -32,14 +32,16 @@
 #include "COM_ChangeHSVOperation.h"
 #include "DNA_node_types.h"
 
-HueSaturationValueNode::HueSaturationValueNode(bNode *editorNode): Node(editorNode) {
+HueSaturationValueNode::HueSaturationValueNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-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();
+	bNode *editorsnode = getbNode();
 	NodeHueSat *storage = (NodeHueSat*)editorsnode->storage;
 
 	ConvertRGBToHSVOperation * rgbToHSV = new ConvertRGBToHSVOperation();
diff --git a/source/blender/compositor/nodes/COM_IDMaskNode.cpp b/source/blender/compositor/nodes/COM_IDMaskNode.cpp
index d66657e489c..ea9e279009c 100644
--- a/source/blender/compositor/nodes/COM_IDMaskNode.cpp
+++ b/source/blender/compositor/nodes/COM_IDMaskNode.cpp
@@ -26,10 +26,12 @@
 #include "COM_ExecutionSystem.h"
 #include "COM_AntiAliasOperation.h"
 
-IDMaskNode::IDMaskNode(bNode *editorNode): Node(editorNode) {
+IDMaskNode::IDMaskNode(bNode *editorNode): Node(editorNode)
+{
 }
-void IDMaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
-	bNode* bnode = this->getbNode();
+void IDMaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
+	bNode *bnode = this->getbNode();
 	IDMaskOperation *operation;
 	operation = new IDMaskOperation();
 	operation->setObjectIndex(bnode->custom1);
diff --git a/source/blender/compositor/nodes/COM_IDMaskNode.h b/source/blender/compositor/nodes/COM_IDMaskNode.h
index 5559044df4e..2ccbbc08f9a 100644
--- a/source/blender/compositor/nodes/COM_IDMaskNode.h
+++ b/source/blender/compositor/nodes/COM_IDMaskNode.h
@@ -32,7 +32,7 @@
 class IDMaskNode: public Node {
 public:
 	IDMaskNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_ImageNode.cpp b/source/blender/compositor/nodes/COM_ImageNode.cpp
index ea2e99ed686..cc2f5f699a5 100644
--- a/source/blender/compositor/nodes/COM_ImageNode.cpp
+++ b/source/blender/compositor/nodes/COM_ImageNode.cpp
@@ -28,9 +28,11 @@
 #include "BKE_node.h"
 #include "BLI_utildefines.h"
 
-ImageNode::ImageNode(bNode *editorNode): Node(editorNode) {
+ImageNode::ImageNode(bNode *editorNode): Node(editorNode)
+{
 }
-NodeOperation* ImageNode::doMultilayerCheck(ExecutionSystem *system, RenderLayer* rl, Image* image, ImageUser* user, int framenumber, int outputsocketIndex, int pass, DataType datatype) {
+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;
 	switch (datatype) {
@@ -55,7 +57,8 @@ 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();
@@ -77,7 +80,7 @@ void ImageNode::convertToOperations(ExecutionSystem *graph, CompositorContext *
 					NodeImageLayer *storage = (NodeImageLayer*)bnodeSocket->storage;
 					int passindex = storage->pass_index;
 					int layerindex = storage->layer_index;
-					RenderLayer *rl= (RenderLayer*)BLI_findlink(&image->rr->layers, layerindex);
+					RenderLayer *rl = (RenderLayer*)BLI_findlink(&image->rr->layers, layerindex);
 					if (rl) {
 					
 						RenderPass *rpass = (RenderPass *)BLI_findlink(&rl->passes, passindex);
diff --git a/source/blender/compositor/nodes/COM_ImageNode.h b/source/blender/compositor/nodes/COM_ImageNode.h
index cfbfbd119f9..70c3ab7f4b0 100644
--- a/source/blender/compositor/nodes/COM_ImageNode.h
+++ b/source/blender/compositor/nodes/COM_ImageNode.h
@@ -36,9 +36,9 @@ extern "C" {
 class ImageNode : public Node {
 
 private:
-	NodeOperation* doMultilayerCheck(ExecutionSystem *system, RenderLayer* rl, Image* image, ImageUser* user, int framenumber, int outputsocketIndex, int pass, DataType datatype);
+	NodeOperation *doMultilayerCheck(ExecutionSystem *system, RenderLayer *rl, Image *image, ImageUser *user, int framenumber, int outputsocketIndex, int pass, DataType datatype);
 public:
-	ImageNode(bNode* editorNode);
+	ImageNode(bNode *editorNode);
 	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 
 };
diff --git a/source/blender/compositor/nodes/COM_InvertNode.cpp b/source/blender/compositor/nodes/COM_InvertNode.cpp
index 2c47b467537..616a63ae948 100644
--- a/source/blender/compositor/nodes/COM_InvertNode.cpp
+++ b/source/blender/compositor/nodes/COM_InvertNode.cpp
@@ -26,12 +26,14 @@
 #include "COM_ExecutionSystem.h"
 #include "BKE_node.h"
 
-InvertNode::InvertNode(bNode *editorNode): Node(editorNode) {
+InvertNode::InvertNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-void InvertNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void InvertNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
 	InvertOperation *operation = new InvertOperation();
-	bNode* node = this->getbNode();
+	bNode *node = this->getbNode();
 	operation->setColor(node->custom1 & CMP_CHAN_RGB);
 	operation->setAlpha(node->custom1 & CMP_CHAN_A);
 	
diff --git a/source/blender/compositor/nodes/COM_InvertNode.h b/source/blender/compositor/nodes/COM_InvertNode.h
index ec70be3ba31..570e86445e6 100644
--- a/source/blender/compositor/nodes/COM_InvertNode.h
+++ b/source/blender/compositor/nodes/COM_InvertNode.h
@@ -32,7 +32,7 @@
 class InvertNode: public Node {
 public:
 	InvertNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_LensDistortionNode.cpp b/source/blender/compositor/nodes/COM_LensDistortionNode.cpp
index cee2b133eee..5719f31180b 100644
--- a/source/blender/compositor/nodes/COM_LensDistortionNode.cpp
+++ b/source/blender/compositor/nodes/COM_LensDistortionNode.cpp
@@ -26,11 +26,13 @@
 #include "COM_ProjectorLensDistortionOperation.h"
 #include "COM_ScreenLensDistortionOperation.h"
 
-LensDistortionNode::LensDistortionNode(bNode *editorNode): Node(editorNode) {
+LensDistortionNode::LensDistortionNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-void LensDistortionNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
-	bNode* editorNode = this->getbNode();
+void LensDistortionNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
+	bNode *editorNode = this->getbNode();
 	NodeLensDist * data = (NodeLensDist*)editorNode->storage;
 	if (data->proj) {
 		ProjectorLensDistortionOperation *operation = new ProjectorLensDistortionOperation();
diff --git a/source/blender/compositor/nodes/COM_LensDistortionNode.h b/source/blender/compositor/nodes/COM_LensDistortionNode.h
index 41b84d4baff..64de740fde8 100644
--- a/source/blender/compositor/nodes/COM_LensDistortionNode.h
+++ b/source/blender/compositor/nodes/COM_LensDistortionNode.h
@@ -32,7 +32,7 @@
 class LensDistortionNode: public Node {
 public:
 	LensDistortionNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp b/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
index 010688b6c2a..8c9ebeed1cf 100644
--- a/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
+++ b/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
@@ -28,14 +28,15 @@
 LuminanceMatteNode::LuminanceMatteNode(bNode *editorNode): Node(editorNode)
 {}
 
-void LuminanceMatteNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context) {
+void LuminanceMatteNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
+{
 	InputSocket *inputSocket = this->getInputSocket(0);
 	OutputSocket *outputSocketImage = this->getOutputSocket(0);
 	OutputSocket *outputSocketMatte = this->getOutputSocket(1);
 
 	ConvertRGBToYUVOperation *rgbToYUV = new ConvertRGBToYUVOperation();
 	LuminanceMatteOperation *operationSet = new LuminanceMatteOperation();
-	bNode* editorsnode = getbNode();
+	bNode *editorsnode = getbNode();
 	operationSet->setSettings((NodeChroma*)editorsnode->storage);
 
 	inputSocket->relinkConnections(rgbToYUV->getInputSocket(0), true, 0, graph);
diff --git a/source/blender/compositor/nodes/COM_MapUVNode.cpp b/source/blender/compositor/nodes/COM_MapUVNode.cpp
index 14129eb7064..32db5ac13a8 100644
--- a/source/blender/compositor/nodes/COM_MapUVNode.cpp
+++ b/source/blender/compositor/nodes/COM_MapUVNode.cpp
@@ -23,17 +23,19 @@
 #include "COM_MapUVOperation.h"
 #include "COM_ExecutionSystem.h"
 
-MapUVNode::MapUVNode(bNode *editorNode): Node(editorNode) {
+MapUVNode::MapUVNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-void MapUVNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void MapUVNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
 	MapUVOperation *operation = new MapUVOperation();
 
 	this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, graph);
 	this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), true, 1, graph);
 	this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket());
 	
-	bNode* node = this->getbNode();
+	bNode *node = this->getbNode();
 	operation->setAlpha((float)node->custom1);
 	operation->setResolutionInputSocketIndex(1);
 
diff --git a/source/blender/compositor/nodes/COM_MapValueNode.cpp b/source/blender/compositor/nodes/COM_MapValueNode.cpp
index 834b74a552d..4ca93113dd5 100644
--- a/source/blender/compositor/nodes/COM_MapValueNode.cpp
+++ b/source/blender/compositor/nodes/COM_MapValueNode.cpp
@@ -25,13 +25,15 @@
 #include "COM_MapValueOperation.h"
 #include "COM_ExecutionSystem.h"
 
-MapValueNode::MapValueNode(bNode *editorNode): Node(editorNode) {
+MapValueNode::MapValueNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-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), true, 0, graph);
diff --git a/source/blender/compositor/nodes/COM_MathNode.cpp b/source/blender/compositor/nodes/COM_MathNode.cpp
index e90767703a5..a5c4aa01721 100644
--- a/source/blender/compositor/nodes/COM_MathNode.cpp
+++ b/source/blender/compositor/nodes/COM_MathNode.cpp
@@ -24,8 +24,9 @@
 #include "COM_MathBaseOperation.h"
 #include "COM_ExecutionSystem.h"
 
-void MathNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
-	MathBaseOperation* operation=NULL;
+void MathNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
+	MathBaseOperation *operation=NULL;
 	
 	switch (this->getbNode()->custom1)
 	{
diff --git a/source/blender/compositor/nodes/COM_MathNode.h b/source/blender/compositor/nodes/COM_MathNode.h
index f5e6b5daebe..1e2cccda396 100644
--- a/source/blender/compositor/nodes/COM_MathNode.h
+++ b/source/blender/compositor/nodes/COM_MathNode.h
@@ -31,7 +31,7 @@
   */
 class MathNode: public Node {
 public:
-	MathNode(bNode* editorNode) :Node(editorNode) {}
+	MathNode(bNode *editorNode) :Node(editorNode) {}
 	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
diff --git a/source/blender/compositor/nodes/COM_MixNode.cpp b/source/blender/compositor/nodes/COM_MixNode.cpp
index 1477163d1fc..63ab83834f2 100644
--- a/source/blender/compositor/nodes/COM_MixNode.cpp
+++ b/source/blender/compositor/nodes/COM_MixNode.cpp
@@ -46,16 +46,18 @@
 #include "DNA_material_types.h" // the ramp types
 
 
-MixNode::MixNode(bNode *editorNode): Node(editorNode) {
+MixNode::MixNode(bNode *editorNode): Node(editorNode)
+{
 }
 
 
-void MixNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void MixNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
 	InputSocket *valueSocket = this->getInputSocket(0);
 	InputSocket *color1Socket = this->getInputSocket(1);
 	InputSocket *color2Socket = this->getInputSocket(2);
 	OutputSocket *outputSocket = this->getOutputSocket(0);
-	bNode* editorNode = this->getbNode();
+	bNode *editorNode = this->getbNode();
 	
 	MixBaseOperation *convertProg;
 	
diff --git a/source/blender/compositor/nodes/COM_MovieClipNode.cpp b/source/blender/compositor/nodes/COM_MovieClipNode.cpp
index 475a538670d..0bddd328007 100644
--- a/source/blender/compositor/nodes/COM_MovieClipNode.cpp
+++ b/source/blender/compositor/nodes/COM_MovieClipNode.cpp
@@ -32,10 +32,12 @@ extern "C" {
 	#include "BKE_tracking.h"
 }
 
-MovieClipNode::MovieClipNode(bNode *editorNode): Node(editorNode) {
+MovieClipNode::MovieClipNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-void MovieClipNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void MovieClipNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
 	OutputSocket *outputMovieClip = this->getOutputSocket(0);
 	OutputSocket *offsetXMovieClip = this->getOutputSocket(1);
 	OutputSocket *offsetYMovieClip = this->getOutputSocket(2);
@@ -46,7 +48,7 @@ void MovieClipNode::convertToOperations(ExecutionSystem *graph, CompositorContex
 	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);
 	}
@@ -79,7 +81,7 @@ void MovieClipNode::convertToOperations(ExecutionSystem *graph, CompositorContex
 	operation->setFramenumber(context->getFramenumber());
 	graph->addOperation(operation);
 
-	MovieTrackingStabilization *stab= &movieClip->tracking.stabilization;
+	MovieTrackingStabilization *stab = &movieClip->tracking.stabilization;
 	float loc[2], scale, angle;
 	loc[0] = 0.0f;
 	loc[1] = 0.0f;
diff --git a/source/blender/compositor/nodes/COM_MovieClipNode.h b/source/blender/compositor/nodes/COM_MovieClipNode.h
index 883ebe486f8..8ad2fa8cbb0 100644
--- a/source/blender/compositor/nodes/COM_MovieClipNode.h
+++ b/source/blender/compositor/nodes/COM_MovieClipNode.h
@@ -31,7 +31,7 @@ class MovieClipNode : public Node {
 
 
 public:
-	MovieClipNode(bNode* editorNode);
+	MovieClipNode(bNode *editorNode);
 	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 
 };
diff --git a/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp b/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp
index 4233f313a87..82949fe10f9 100644
--- a/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp
+++ b/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp
@@ -26,13 +26,15 @@
 #include "COM_ExecutionSystem.h"
 #include "DNA_movieclip_types.h"
 
-MovieDistortionNode::MovieDistortionNode(bNode *editorNode) : Node(editorNode) {
+MovieDistortionNode::MovieDistortionNode(bNode *editorNode) : Node(editorNode)
+{
 }
 
-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();
+	bNode *bnode = this->getbNode();
 	MovieClip * clip = (MovieClip*)bnode->id;
 	
 	MovieDistortionOperation * operation = new MovieDistortionOperation(bnode->custom1 == 1);
diff --git a/source/blender/compositor/nodes/COM_MovieDistortionNode.h b/source/blender/compositor/nodes/COM_MovieDistortionNode.h
index 28eec5011a2..5ee328c9df3 100644
--- a/source/blender/compositor/nodes/COM_MovieDistortionNode.h
+++ b/source/blender/compositor/nodes/COM_MovieDistortionNode.h
@@ -32,7 +32,7 @@
 class MovieDistortionNode: public Node {
 public:
 	MovieDistortionNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_MuteNode.cpp b/source/blender/compositor/nodes/COM_MuteNode.cpp
index cb3d4be8834..72303a4d6ee 100644
--- a/source/blender/compositor/nodes/COM_MuteNode.cpp
+++ b/source/blender/compositor/nodes/COM_MuteNode.cpp
@@ -27,10 +27,12 @@
 #include "COM_SetVectorOperation.h"
 #include "COM_SetColorOperation.h"
 
-MuteNode::MuteNode(bNode *editorNode): Node(editorNode) {
+MuteNode::MuteNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-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 ++) {
 		InputSocket *input = inputsockets[index];
@@ -83,7 +85,8 @@ 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();
 
 	for (unsigned int index = 0 ; index < outputsockets.size() ; index ++) {
diff --git a/source/blender/compositor/nodes/COM_MuteNode.h b/source/blender/compositor/nodes/COM_MuteNode.h
index c2d1f283c62..2dfc786ef2b 100644
--- a/source/blender/compositor/nodes/COM_MuteNode.h
+++ b/source/blender/compositor/nodes/COM_MuteNode.h
@@ -32,9 +32,9 @@
 class MuteNode: public Node {
 public:
 	MuteNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 private:
-	void reconnect(ExecutionSystem* graph, OutputSocket * output);
+	void reconnect(ExecutionSystem *graph, OutputSocket * output);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_NormalNode.cpp b/source/blender/compositor/nodes/COM_NormalNode.cpp
index b54d8b8aab6..58b6ba1f410 100644
--- a/source/blender/compositor/nodes/COM_NormalNode.cpp
+++ b/source/blender/compositor/nodes/COM_NormalNode.cpp
@@ -26,14 +26,15 @@
 #include "COM_DotproductOperation.h"
 #include "COM_SetVectorOperation.h"
 
-NormalNode::NormalNode(bNode* editorNode): Node(editorNode)
+NormalNode::NormalNode(bNode *editorNode): Node(editorNode)
 {}
 
-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();
+	bNode *editorNode = this->getbNode();
 	
 	SetVectorOperation * operationSet = new SetVectorOperation();
 	bNodeSocket * insock = (bNodeSocket*)editorNode->outputs.first;
diff --git a/source/blender/compositor/nodes/COM_NormalNode.h b/source/blender/compositor/nodes/COM_NormalNode.h
index 97a2f4bdd06..1e7c7c584c3 100644
--- a/source/blender/compositor/nodes/COM_NormalNode.h
+++ b/source/blender/compositor/nodes/COM_NormalNode.h
@@ -32,8 +32,8 @@
 class NormalNode : public Node
 {
 public:
-	NormalNode(bNode* editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	NormalNode(bNode *editorNode);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif // COM_NormalNODE_H
diff --git a/source/blender/compositor/nodes/COM_NormalizeNode.cpp b/source/blender/compositor/nodes/COM_NormalizeNode.cpp
index dbe8278af0f..f3fe8579a86 100644
--- a/source/blender/compositor/nodes/COM_NormalizeNode.cpp
+++ b/source/blender/compositor/nodes/COM_NormalizeNode.cpp
@@ -23,10 +23,12 @@
 #include "COM_NormalizeOperation.h"
 #include "COM_ExecutionSystem.h"
 
-NormalizeNode::NormalizeNode(bNode *editorNode): Node(editorNode) {
+NormalizeNode::NormalizeNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-void NormalizeNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void NormalizeNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
 	NormalizeOperation *operation = new NormalizeOperation();
 
 	this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, graph);
diff --git a/source/blender/compositor/nodes/COM_NormalizeNode.h b/source/blender/compositor/nodes/COM_NormalizeNode.h
index b955b52391e..ce7a6e1f7ab 100644
--- a/source/blender/compositor/nodes/COM_NormalizeNode.h
+++ b/source/blender/compositor/nodes/COM_NormalizeNode.h
@@ -31,7 +31,7 @@
 class NormalizeNode: public Node {
 public:
 	NormalizeNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_OutputFileNode.cpp b/source/blender/compositor/nodes/COM_OutputFileNode.cpp
index d844861cdd5..e70e4f296d6 100644
--- a/source/blender/compositor/nodes/COM_OutputFileNode.cpp
+++ b/source/blender/compositor/nodes/COM_OutputFileNode.cpp
@@ -27,11 +27,13 @@
 #include "BLI_path_util.h"
 #include "BKE_utildefines.h"
 
-OutputFileNode::OutputFileNode(bNode *editorNode): Node(editorNode) {
+OutputFileNode::OutputFileNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-void OutputFileNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
-	NodeImageMultiFile* storage = (NodeImageMultiFile*)this->getbNode()->storage;
+void OutputFileNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
+	NodeImageMultiFile *storage = (NodeImageMultiFile*)this->getbNode()->storage;
 	
 	if (!context->isRendering()) {
 		/* XXX TODO as in previous implementation?
diff --git a/source/blender/compositor/nodes/COM_RenderLayersNode.cpp b/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
index e4ce63e9193..4e99db090e1 100644
--- a/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
+++ b/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
@@ -47,12 +47,14 @@
 #include "COM_ScaleOperation.h"
 #include "COM_SetValueOperation.h"
 
-RenderLayersNode::RenderLayersNode(bNode *editorNode): Node(editorNode) {
+RenderLayersNode::RenderLayersNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-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()) {
@@ -77,7 +79,8 @@ 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());
 	testSocketConnection(graph, 2, new RenderLayersDepthProg());
diff --git a/source/blender/compositor/nodes/COM_RenderLayersNode.h b/source/blender/compositor/nodes/COM_RenderLayersNode.h
index 285b6f6d007..f796a7147d9 100644
--- a/source/blender/compositor/nodes/COM_RenderLayersNode.h
+++ b/source/blender/compositor/nodes/COM_RenderLayersNode.h
@@ -30,8 +30,8 @@
   */
 class RenderLayersNode : public Node {
 public:
-	RenderLayersNode(bNode* editorNode);
+	RenderLayersNode(bNode *editorNode);
 	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 private:
-	void testSocketConnection(ExecutionSystem* graph, int outputSocketNumber, RenderLayersBaseProg * operation);
+	void testSocketConnection(ExecutionSystem *graph, int outputSocketNumber, RenderLayersBaseProg * operation);
 };
diff --git a/source/blender/compositor/nodes/COM_RotateNode.cpp b/source/blender/compositor/nodes/COM_RotateNode.cpp
index 059a62874bb..f5fdf19398d 100644
--- a/source/blender/compositor/nodes/COM_RotateNode.cpp
+++ b/source/blender/compositor/nodes/COM_RotateNode.cpp
@@ -26,10 +26,12 @@
 #include "COM_ExecutionSystem.h"
 #include "COM_SetSamplerOperation.h"
 
-RotateNode::RotateNode(bNode *editorNode) : Node(editorNode) {
+RotateNode::RotateNode(bNode *editorNode) : Node(editorNode)
+{
 }
 
-void RotateNode::convertToOperations(ExecutionSystem *system, CompositorContext * context) {
+void RotateNode::convertToOperations(ExecutionSystem *system, CompositorContext * context)
+{
 	InputSocket *inputSocket = this->getInputSocket(0);
 	InputSocket *inputDegreeSocket = this->getInputSocket(1);
 	OutputSocket *outputSocket = this->getOutputSocket(0);
diff --git a/source/blender/compositor/nodes/COM_RotateNode.h b/source/blender/compositor/nodes/COM_RotateNode.h
index 7e4f7a1a546..9b471742aab 100644
--- a/source/blender/compositor/nodes/COM_RotateNode.h
+++ b/source/blender/compositor/nodes/COM_RotateNode.h
@@ -32,7 +32,7 @@
 class RotateNode: public Node {
 public:
 	RotateNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_ScaleNode.cpp b/source/blender/compositor/nodes/COM_ScaleNode.cpp
index b281ed64d79..fe5862da018 100644
--- a/source/blender/compositor/nodes/COM_ScaleNode.cpp
+++ b/source/blender/compositor/nodes/COM_ScaleNode.cpp
@@ -27,15 +27,17 @@
 #include "BKE_node.h"
 #include "COM_SetValueOperation.h"
 
-ScaleNode::ScaleNode(bNode *editorNode) : Node(editorNode) {
+ScaleNode::ScaleNode(bNode *editorNode) : Node(editorNode)
+{
 }
 
-void ScaleNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void ScaleNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
 	InputSocket *inputSocket = this->getInputSocket(0);
 	InputSocket *inputXSocket = this->getInputSocket(1);
 	InputSocket *inputYSocket = this->getInputSocket(2);
 	OutputSocket *outputSocket = this->getOutputSocket(0);
-	bNode* bnode = this->getbNode();
+	bNode *bnode = this->getbNode();
 	switch (bnode->custom1) {
 	case CMP_SCALE_RELATIVE: {
 		ScaleOperation *operation = new ScaleOperation();
@@ -61,7 +63,7 @@ void ScaleNode::convertToOperations(ExecutionSystem *graph, CompositorContext *
 		break;
 		
 	case CMP_SCALE_RENDERPERCENT: {
-		const RenderData* data = &context->getScene()->r;
+		const RenderData *data = &context->getScene()->r;
 		ScaleFixedSizeOperation * operation = new ScaleFixedSizeOperation();
 		operation->setNewWidth(data->xsch*data->size/100.0f);
 		operation->setNewHeight(data->ysch*data->size/100.0f);
diff --git a/source/blender/compositor/nodes/COM_ScaleNode.h b/source/blender/compositor/nodes/COM_ScaleNode.h
index b6a1a56d8c9..310ae96a65e 100644
--- a/source/blender/compositor/nodes/COM_ScaleNode.h
+++ b/source/blender/compositor/nodes/COM_ScaleNode.h
@@ -32,7 +32,7 @@
 class ScaleNode: public Node {
 public:
 	ScaleNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_SeparateHSVANode.cpp b/source/blender/compositor/nodes/COM_SeparateHSVANode.cpp
index 922b9c051d5..cfce56a080a 100644
--- a/source/blender/compositor/nodes/COM_SeparateHSVANode.cpp
+++ b/source/blender/compositor/nodes/COM_SeparateHSVANode.cpp
@@ -27,10 +27,12 @@
 #include "COM_SetValueOperation.h"
 #include "COM_ConvertRGBToHSVOperation.h"
 
-SeparateHSVANode::SeparateHSVANode(bNode *editorNode): SeparateRGBANode(editorNode) {
+SeparateHSVANode::SeparateHSVANode(bNode *editorNode): SeparateRGBANode(editorNode)
+{
 }
 
-void SeparateHSVANode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void SeparateHSVANode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
 	ConvertRGBToHSVOperation *operation = new ConvertRGBToHSVOperation();
 	InputSocket *inputSocket = this->getInputSocket(0);
 	if (inputSocket->isConnected()) {
diff --git a/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp b/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp
index 08b3c87cbf9..7079762d465 100644
--- a/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp
+++ b/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp
@@ -28,11 +28,13 @@
 #include "DNA_material_types.h" // the ramp types
 
 
-SeparateRGBANode::SeparateRGBANode(bNode *editorNode): Node(editorNode) {
+SeparateRGBANode::SeparateRGBANode(bNode *editorNode): Node(editorNode)
+{
 }
 
 
-void SeparateRGBANode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void SeparateRGBANode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
 	InputSocket *imageSocket = this->getInputSocket(0);
 	OutputSocket *outputRSocket = this->getOutputSocket(0);
 	OutputSocket *outputGSocket = this->getOutputSocket(1);
@@ -45,26 +47,26 @@ void SeparateRGBANode::convertToOperations(ExecutionSystem *graph, CompositorCon
 		imageSocket->relinkConnections(operation->getInputSocket(0), true, 0, true, graph);
 		outputRSocket->relinkConnections(operation->getOutputSocket(0));
 		graph->addOperation(operation);
-	 }
+	}
 	if (outputGSocket->isConnected()) {
 		SeparateChannelOperation *operation = new SeparateChannelOperation();
 		operation->setChannel(1);
 		imageSocket->relinkConnections(operation->getInputSocket(0), true, 0, true, graph);
 		outputGSocket->relinkConnections(operation->getOutputSocket(0));
 		graph->addOperation(operation);
-	 }
+	}
 	if (outputBSocket->isConnected()) {
 		SeparateChannelOperation *operation = new SeparateChannelOperation();
 		operation->setChannel(2);
 		imageSocket->relinkConnections(operation->getInputSocket(0), true, 0, true, graph);
 		outputBSocket->relinkConnections(operation->getOutputSocket(0));
 		graph->addOperation(operation);
-	 }
+	}
 	if (outputASocket->isConnected()) {
 		SeparateChannelOperation *operation = new SeparateChannelOperation();
 		operation->setChannel(3);
 		imageSocket->relinkConnections(operation->getInputSocket(0), true, 0, true, graph);
 		outputASocket->relinkConnections(operation->getOutputSocket(0));
 		graph->addOperation(operation);
-	 }
+	}
 }
diff --git a/source/blender/compositor/nodes/COM_SeparateYCCANode.cpp b/source/blender/compositor/nodes/COM_SeparateYCCANode.cpp
index 854f74cda4c..68d20235de7 100644
--- a/source/blender/compositor/nodes/COM_SeparateYCCANode.cpp
+++ b/source/blender/compositor/nodes/COM_SeparateYCCANode.cpp
@@ -25,10 +25,12 @@
 #include "COM_SetValueOperation.h"
 #include "COM_ConvertRGBToYCCOperation.h"
 
-SeparateYCCANode::SeparateYCCANode(bNode *editorNode): SeparateRGBANode(editorNode) {
+SeparateYCCANode::SeparateYCCANode(bNode *editorNode): SeparateRGBANode(editorNode)
+{
 }
 
-void SeparateYCCANode::convertToOperations(ExecutionSystem *graph, CompositorContext *context) {
+void SeparateYCCANode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
+{
 	ConvertRGBToYCCOperation *operation = new ConvertRGBToYCCOperation();
 	InputSocket *inputSocket = this->getInputSocket(0);
 
diff --git a/source/blender/compositor/nodes/COM_SeparateYUVANode.cpp b/source/blender/compositor/nodes/COM_SeparateYUVANode.cpp
index db8a8bd2697..650e5d1340b 100644
--- a/source/blender/compositor/nodes/COM_SeparateYUVANode.cpp
+++ b/source/blender/compositor/nodes/COM_SeparateYUVANode.cpp
@@ -25,10 +25,12 @@
 #include "COM_SetValueOperation.h"
 #include "COM_ConvertRGBToYUVOperation.h"
 
-SeparateYUVANode::SeparateYUVANode(bNode *editorNode): SeparateRGBANode(editorNode) {
+SeparateYUVANode::SeparateYUVANode(bNode *editorNode): SeparateRGBANode(editorNode)
+{
 }
 
-void SeparateYUVANode::convertToOperations(ExecutionSystem *graph, CompositorContext *context) {
+void SeparateYUVANode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
+{
 	ConvertRGBToYUVOperation *operation = new ConvertRGBToYUVOperation();
 	InputSocket *inputSocket = this->getInputSocket(0);
 	if (inputSocket->isConnected()) {
diff --git a/source/blender/compositor/nodes/COM_SetAlphaNode.cpp b/source/blender/compositor/nodes/COM_SetAlphaNode.cpp
index 5dd7dea1fa8..90db6682184 100644
--- a/source/blender/compositor/nodes/COM_SetAlphaNode.cpp
+++ b/source/blender/compositor/nodes/COM_SetAlphaNode.cpp
@@ -24,8 +24,9 @@
 #include "COM_SetAlphaOperation.h"
 #include "COM_ExecutionSystem.h"
 
-void SetAlphaNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
-	SetAlphaOperation* operation = new SetAlphaOperation();
+void SetAlphaNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
+	SetAlphaOperation *operation = new SetAlphaOperation();
 	
 	this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, graph);
 	this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), true, 0, graph);
diff --git a/source/blender/compositor/nodes/COM_SetAlphaNode.h b/source/blender/compositor/nodes/COM_SetAlphaNode.h
index c9d819d172e..c6b603049c5 100644
--- a/source/blender/compositor/nodes/COM_SetAlphaNode.h
+++ b/source/blender/compositor/nodes/COM_SetAlphaNode.h
@@ -31,7 +31,7 @@
   */
 class SetAlphaNode: public Node {
 public:
-	SetAlphaNode(bNode* editorNode) :Node(editorNode) {}
+	SetAlphaNode(bNode *editorNode) :Node(editorNode) {}
 	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
diff --git a/source/blender/compositor/nodes/COM_SocketProxyNode.cpp b/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
index 6730036baf6..42dd49bd1da 100644
--- a/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
+++ b/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
@@ -28,7 +28,8 @@
 #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;
 	
 	dt = COM_DT_VALUE;
@@ -42,7 +43,8 @@ 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);
 	if (outputsocket->isConnected()) {
 		SocketProxyOperation *operation = new SocketProxyOperation();
@@ -52,7 +54,8 @@ void SocketProxyNode::convertToOperations(ExecutionSystem *graph, CompositorCont
 	}
 }
 
-void OutputSocketProxyNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void OutputSocketProxyNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
 	OutputSocket * outputsocket = this->getOutputSocket(0);
 	InputSocket * inputsocket = this->getInputSocket(0);
 	if (outputsocket->isConnected()) {
diff --git a/source/blender/compositor/nodes/COM_SocketProxyNode.h b/source/blender/compositor/nodes/COM_SocketProxyNode.h
index eb14f84c46a..1b5ee699211 100644
--- a/source/blender/compositor/nodes/COM_SocketProxyNode.h
+++ b/source/blender/compositor/nodes/COM_SocketProxyNode.h
@@ -32,7 +32,7 @@
 class SocketProxyNode: public Node {
 public:
 	SocketProxyNode(bNode *editorNode, bNodeSocket *editorInput, bNodeSocket *editorOutput);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 
 	virtual bool isProxyNode() const { return true; }
 };
@@ -40,7 +40,7 @@ public:
 class OutputSocketProxyNode: public SocketProxyNode {
 public:
 	OutputSocketProxyNode(bNode *editorNode, bNodeSocket *editorInput, bNodeSocket *editorOutput): SocketProxyNode(editorNode, editorInput, editorOutput) {}
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_SplitViewerNode.cpp b/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
index 12204c65112..d1a2cccf758 100644
--- a/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
+++ b/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
@@ -26,13 +26,15 @@
 #include "COM_SplitViewerOperation.h"
 #include "COM_ExecutionSystem.h"
 
-SplitViewerNode::SplitViewerNode(bNode *editorNode): Node(editorNode) {
+SplitViewerNode::SplitViewerNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-void SplitViewerNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void SplitViewerNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
 	InputSocket *image1Socket = this->getInputSocket(0);
 	InputSocket *image2Socket = this->getInputSocket(1);
-	Image* image = (Image*)this->getbNode()->id;
+	Image *image = (Image*)this->getbNode()->id;
 	ImageUser * imageUser = (ImageUser*) this->getbNode()->storage;
 	if (image1Socket->isConnected() && image2Socket->isConnected()) {
 		SplitViewerOperation *splitViewerOperation = new SplitViewerOperation();
diff --git a/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp b/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
index 74fde974784..047b4fa4bf6 100644
--- a/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
+++ b/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
@@ -32,12 +32,14 @@ extern "C" {
 	#include "BKE_tracking.h"
 }
 
-Stabilize2dNode::Stabilize2dNode(bNode *editorNode): Node(editorNode) {
+Stabilize2dNode::Stabilize2dNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-void Stabilize2dNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void Stabilize2dNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
 	InputSocket *imageInput = this->getInputSocket(0);
-	MovieClip *clip= (MovieClip *)getbNode()->id;
+	MovieClip *clip = (MovieClip *)getbNode()->id;
 	
 	ScaleOperation * scaleOperation = new ScaleOperation();
 	RotateOperation * rotateOperation = new RotateOperation();
diff --git a/source/blender/compositor/nodes/COM_Stabilize2dNode.h b/source/blender/compositor/nodes/COM_Stabilize2dNode.h
index 613bb97b994..63bf50b4d69 100644
--- a/source/blender/compositor/nodes/COM_Stabilize2dNode.h
+++ b/source/blender/compositor/nodes/COM_Stabilize2dNode.h
@@ -29,6 +29,6 @@
   */
 class Stabilize2dNode : public Node {
 public:
-	Stabilize2dNode(bNode* editorNode);
+	Stabilize2dNode(bNode *editorNode);
 	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
diff --git a/source/blender/compositor/nodes/COM_SwitchNode.cpp b/source/blender/compositor/nodes/COM_SwitchNode.cpp
index 83e0be7d3c0..c65d7fbdc61 100644
--- a/source/blender/compositor/nodes/COM_SwitchNode.cpp
+++ b/source/blender/compositor/nodes/COM_SwitchNode.cpp
@@ -24,11 +24,13 @@
 #include "COM_ExecutionSystem.h"
 #include "COM_SocketProxyOperation.h"
 
-SwitchNode::SwitchNode(bNode *editorNode): Node(editorNode) {
+SwitchNode::SwitchNode(bNode *editorNode): Node(editorNode)
+{
 }
 
 
-void SwitchNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void SwitchNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
 	SocketProxyOperation * operation = new SocketProxyOperation();
 	int switchFrame = this->getbNode()->custom1;
 
diff --git a/source/blender/compositor/nodes/COM_TextureNode.cpp b/source/blender/compositor/nodes/COM_TextureNode.cpp
index ac78c1afd7d..0f9a2ca4c26 100644
--- a/source/blender/compositor/nodes/COM_TextureNode.cpp
+++ b/source/blender/compositor/nodes/COM_TextureNode.cpp
@@ -24,13 +24,15 @@
 #include "COM_ExecutionSystem.h"
 #include "COM_TextureOperation.h"
 
-TextureNode::TextureNode(bNode *editorNode): Node(editorNode) {
+TextureNode::TextureNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-void TextureNode::convertToOperations(ExecutionSystem *system, CompositorContext * context) {
-	bNode* editorNode = this->getbNode();
-	Tex* texture = (Tex*)editorNode->id;
-	TextureOperation* operation = new TextureOperation();
+void TextureNode::convertToOperations(ExecutionSystem *system, CompositorContext * context)
+{
+	bNode *editorNode = this->getbNode();
+	Tex *texture = (Tex*)editorNode->id;
+	TextureOperation *operation = new TextureOperation();
 	this->getOutputSocket(1)->relinkConnections(operation->getOutputSocket());
 	this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true, 0, system);
 	this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), true, 1, system);
@@ -39,7 +41,7 @@ void TextureNode::convertToOperations(ExecutionSystem *system, CompositorContext
 	addPreviewOperation(system, operation->getOutputSocket(), 9);
 
 	if (this->getOutputSocket(0)->isConnected()) {
-		TextureAlphaOperation* alphaOperation = new TextureAlphaOperation();
+		TextureAlphaOperation *alphaOperation = new TextureAlphaOperation();
 		this->getOutputSocket(0)->relinkConnections(alphaOperation->getOutputSocket());
 		addLink(system, operation->getInputSocket(0)->getConnection()->getFromSocket(), alphaOperation->getInputSocket(0));
 		addLink(system, operation->getInputSocket(1)->getConnection()->getFromSocket(), alphaOperation->getInputSocket(1));
diff --git a/source/blender/compositor/nodes/COM_TextureNode.h b/source/blender/compositor/nodes/COM_TextureNode.h
index 493c94ddb19..15c39db9077 100644
--- a/source/blender/compositor/nodes/COM_TextureNode.h
+++ b/source/blender/compositor/nodes/COM_TextureNode.h
@@ -29,6 +29,6 @@
   */
 class TextureNode : public Node {
 public:
-	TextureNode(bNode* editorNode);
+	TextureNode(bNode *editorNode);
 	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
diff --git a/source/blender/compositor/nodes/COM_TimeNode.cpp b/source/blender/compositor/nodes/COM_TimeNode.cpp
index 481840cbd58..11bc29679b9 100644
--- a/source/blender/compositor/nodes/COM_TimeNode.cpp
+++ b/source/blender/compositor/nodes/COM_TimeNode.cpp
@@ -29,16 +29,18 @@ extern "C" {
 }
 #include "BLI_utildefines.h"
 
-TimeNode::TimeNode(bNode *editorNode): Node(editorNode) {
+TimeNode::TimeNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-void TimeNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void TimeNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
 	SetValueOperation *operation = new SetValueOperation();
 	this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket());
-	bNode* node = this->getbNode();
+	bNode *node = this->getbNode();
 
 	/* stack order output: fac */
-	float fac= 0.0f;
+	float fac = 0.0f;
 	const int framenumber = context->getFramenumber();
 
 	if (framenumber < node->custom1) {
@@ -48,10 +50,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_TimeNode.h b/source/blender/compositor/nodes/COM_TimeNode.h
index 25134db8528..26751f6f104 100644
--- a/source/blender/compositor/nodes/COM_TimeNode.h
+++ b/source/blender/compositor/nodes/COM_TimeNode.h
@@ -32,7 +32,7 @@
 class TimeNode: public Node {
 public:
 	TimeNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_TonemapNode.cpp b/source/blender/compositor/nodes/COM_TonemapNode.cpp
index a610146a495..7e170ea1704 100644
--- a/source/blender/compositor/nodes/COM_TonemapNode.cpp
+++ b/source/blender/compositor/nodes/COM_TonemapNode.cpp
@@ -25,11 +25,13 @@
 #include "COM_TonemapOperation.h"
 #include "COM_ExecutionSystem.h"
 
-TonemapNode::TonemapNode(bNode *editorNode): Node(editorNode) {
+TonemapNode::TonemapNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-void TonemapNode::convertToOperations(ExecutionSystem *system, CompositorContext * context) {
-	NodeTonemap* data = (NodeTonemap*)this->getbNode()->storage;
+void TonemapNode::convertToOperations(ExecutionSystem *system, CompositorContext * context)
+{
+	NodeTonemap *data = (NodeTonemap*)this->getbNode()->storage;
 	TonemapOperation *operation = data->type==1?new PhotoreceptorTonemapOperation():new TonemapOperation();
 
 	operation->setData(data);
diff --git a/source/blender/compositor/nodes/COM_TonemapNode.h b/source/blender/compositor/nodes/COM_TonemapNode.h
index 2140d7deb6a..d6dd8474afa 100644
--- a/source/blender/compositor/nodes/COM_TonemapNode.h
+++ b/source/blender/compositor/nodes/COM_TonemapNode.h
@@ -32,7 +32,7 @@
 class TonemapNode: public Node {
 public:
 	TonemapNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_TransformNode.cpp b/source/blender/compositor/nodes/COM_TransformNode.cpp
index 9b6d5ec35c5..6762cb0687a 100644
--- a/source/blender/compositor/nodes/COM_TransformNode.cpp
+++ b/source/blender/compositor/nodes/COM_TransformNode.cpp
@@ -28,10 +28,12 @@
 #include "COM_SetValueOperation.h"
 #include "COM_SetSamplerOperation.h"
 
-TransformNode::TransformNode(bNode *editorNode): Node(editorNode) {
+TransformNode::TransformNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-void TransformNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void TransformNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
 	InputSocket *imageInput = this->getInputSocket(0);
 	InputSocket *xInput = this->getInputSocket(1);
 	InputSocket *yInput = this->getInputSocket(2);
diff --git a/source/blender/compositor/nodes/COM_TransformNode.h b/source/blender/compositor/nodes/COM_TransformNode.h
index bcb71ba8e5d..237da44afd9 100644
--- a/source/blender/compositor/nodes/COM_TransformNode.h
+++ b/source/blender/compositor/nodes/COM_TransformNode.h
@@ -29,6 +29,6 @@
   */
 class TransformNode : public Node {
 public:
-	TransformNode(bNode* editorNode);
+	TransformNode(bNode *editorNode);
 	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
diff --git a/source/blender/compositor/nodes/COM_TranslateNode.cpp b/source/blender/compositor/nodes/COM_TranslateNode.cpp
index 4dfa901610c..f594db3c160 100644
--- a/source/blender/compositor/nodes/COM_TranslateNode.cpp
+++ b/source/blender/compositor/nodes/COM_TranslateNode.cpp
@@ -25,10 +25,12 @@
 #include "COM_TranslateOperation.h"
 #include "COM_ExecutionSystem.h"
 
-TranslateNode::TranslateNode(bNode *editorNode) : Node(editorNode) {
+TranslateNode::TranslateNode(bNode *editorNode) : Node(editorNode)
+{
 }
 
-void TranslateNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void TranslateNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
 	InputSocket *inputSocket = this->getInputSocket(0);
 	InputSocket *inputXSocket = this->getInputSocket(1);
 	InputSocket *inputYSocket = this->getInputSocket(2);
diff --git a/source/blender/compositor/nodes/COM_TranslateNode.h b/source/blender/compositor/nodes/COM_TranslateNode.h
index 8f7558ea468..295024d6beb 100644
--- a/source/blender/compositor/nodes/COM_TranslateNode.h
+++ b/source/blender/compositor/nodes/COM_TranslateNode.h
@@ -32,7 +32,7 @@
 class TranslateNode: public Node {
 public:
 	TranslateNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_ValueNode.cpp b/source/blender/compositor/nodes/COM_ValueNode.cpp
index 0b40872bed4..39245e75a2f 100644
--- a/source/blender/compositor/nodes/COM_ValueNode.cpp
+++ b/source/blender/compositor/nodes/COM_ValueNode.cpp
@@ -25,12 +25,14 @@
 #include "COM_SetValueOperation.h"
 #include "COM_ExecutionSystem.h"
 
-ValueNode::ValueNode(bNode *editorNode): Node(editorNode) {
+ValueNode::ValueNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-void ValueNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void ValueNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
 	SetValueOperation *operation = new SetValueOperation();
-	bNodeSocket* socket = this->getEditorOutputSocket(0);
+	bNodeSocket *socket = this->getEditorOutputSocket(0);
 	bNodeSocketValueFloat *dval = (bNodeSocketValueFloat*)socket->default_value;
 	this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket());
 	operation->setValue(dval->value);
diff --git a/source/blender/compositor/nodes/COM_ValueNode.h b/source/blender/compositor/nodes/COM_ValueNode.h
index f0322a9704c..4faf193fc8e 100644
--- a/source/blender/compositor/nodes/COM_ValueNode.h
+++ b/source/blender/compositor/nodes/COM_ValueNode.h
@@ -32,7 +32,7 @@
 class ValueNode: public Node {
 public:
 	ValueNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_VectorBlurNode.cpp b/source/blender/compositor/nodes/COM_VectorBlurNode.cpp
index 2063f21c785..4baa2315799 100644
--- a/source/blender/compositor/nodes/COM_VectorBlurNode.cpp
+++ b/source/blender/compositor/nodes/COM_VectorBlurNode.cpp
@@ -28,12 +28,14 @@
 #include "COM_SetValueOperation.h"
 #include "COM_MixBlendOperation.h"
 
-VectorBlurNode::VectorBlurNode(bNode *editorNode): Node(editorNode) {
+VectorBlurNode::VectorBlurNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-void VectorBlurNode::convertToOperations(ExecutionSystem *system, CompositorContext * context) {
-	bNode* node = this->getbNode();
-	NodeBlurData* vectorBlurSettings = (NodeBlurData*)node->storage;
+void VectorBlurNode::convertToOperations(ExecutionSystem *system, CompositorContext * context)
+{
+	bNode *node = this->getbNode();
+	NodeBlurData *vectorBlurSettings = (NodeBlurData*)node->storage;
 	VectorBlurOperation *operation = new VectorBlurOperation();
 	operation->setVectorBlurSettings(vectorBlurSettings);
 	operation->setQuality(context->getQuality());
diff --git a/source/blender/compositor/nodes/COM_VectorBlurNode.h b/source/blender/compositor/nodes/COM_VectorBlurNode.h
index 54449bde1d3..1df945731ce 100644
--- a/source/blender/compositor/nodes/COM_VectorBlurNode.h
+++ b/source/blender/compositor/nodes/COM_VectorBlurNode.h
@@ -32,7 +32,7 @@
 class VectorBlurNode: public Node {
 public:
 	VectorBlurNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_VectorCurveNode.cpp b/source/blender/compositor/nodes/COM_VectorCurveNode.cpp
index c62906a82a6..2f216b5d5bd 100644
--- a/source/blender/compositor/nodes/COM_VectorCurveNode.cpp
+++ b/source/blender/compositor/nodes/COM_VectorCurveNode.cpp
@@ -25,10 +25,12 @@
 #include "COM_VectorCurveOperation.h"
 #include "COM_ExecutionSystem.h"
 
-VectorCurveNode::VectorCurveNode(bNode *editorNode): Node(editorNode) {
+VectorCurveNode::VectorCurveNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-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), true, 0, graph);
diff --git a/source/blender/compositor/nodes/COM_VectorCurveNode.h b/source/blender/compositor/nodes/COM_VectorCurveNode.h
index e18dac54c2c..9fbcfd50156 100644
--- a/source/blender/compositor/nodes/COM_VectorCurveNode.h
+++ b/source/blender/compositor/nodes/COM_VectorCurveNode.h
@@ -32,7 +32,7 @@
 class VectorCurveNode: public Node {
 public:
 	VectorCurveNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp b/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
index 42d019c4e93..9aa922faa5d 100644
--- a/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
+++ b/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
@@ -26,13 +26,15 @@
 #include "COM_CalculateMeanOperation.h"
 #include "COM_CalculateStandardDeviationOperation.h"
 
-ViewLevelsNode::ViewLevelsNode(bNode *editorNode): Node(editorNode) {
+ViewLevelsNode::ViewLevelsNode(bNode *editorNode): Node(editorNode)
+{
 }
-void ViewLevelsNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void ViewLevelsNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+{
 	InputSocket * input = this->getInputSocket(0);
 	bool firstOperationConnected = false;
 	if (input->isConnected()) {
-		OutputSocket* inputSocket= input->getConnection()->getFromSocket();
+		OutputSocket *inputSocket = input->getConnection()->getFromSocket();
 		// add preview to inputSocket;
 		
 		OutputSocket * socket = this->getOutputSocket(0);
diff --git a/source/blender/compositor/nodes/COM_ViewLevelsNode.h b/source/blender/compositor/nodes/COM_ViewLevelsNode.h
index 9d6b764a2a9..11be6216cba 100644
--- a/source/blender/compositor/nodes/COM_ViewLevelsNode.h
+++ b/source/blender/compositor/nodes/COM_ViewLevelsNode.h
@@ -32,7 +32,7 @@
 class ViewLevelsNode: public Node {
 public:
 	ViewLevelsNode(bNode *editorNode);
-	void convertToOperations(ExecutionSystem* graph, CompositorContext * context);
+	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };
 
 #endif
diff --git a/source/blender/compositor/nodes/COM_ViewerNode.cpp b/source/blender/compositor/nodes/COM_ViewerNode.cpp
index 0148fac47f9..d518976143d 100644
--- a/source/blender/compositor/nodes/COM_ViewerNode.cpp
+++ b/source/blender/compositor/nodes/COM_ViewerNode.cpp
@@ -26,16 +26,18 @@
 #include "COM_ViewerOperation.h"
 #include "COM_ExecutionSystem.h"
 
-ViewerNode::ViewerNode(bNode *editorNode): Node(editorNode) {
+ViewerNode::ViewerNode(bNode *editorNode): Node(editorNode)
+{
 }
 
-void ViewerNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
+void ViewerNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)\
+{
 	InputSocket *imageSocket = this->getInputSocket(0);
 	InputSocket *alphaSocket = this->getInputSocket(1);
-	Image* image = (Image*)this->getbNode()->id;
+	Image *image = (Image*)this->getbNode()->id;
 	ImageUser * imageUser = (ImageUser*) this->getbNode()->storage;
 	if (imageSocket->isConnected()) {
-		bNode* editorNode = this->getbNode();
+		bNode *editorNode = this->getbNode();
 		ViewerOperation *viewerOperation = new ViewerOperation();
 		viewerOperation->setColorManagement( context->getScene()->r.color_mgt_flag & R_COLOR_MANAGEMENT);
 		viewerOperation->setColorPredivide( context->getScene()->r.color_mgt_flag & R_COLOR_MANAGEMENT_PREDIVIDE);
diff --git a/source/blender/compositor/nodes/COM_ZCombineNode.cpp b/source/blender/compositor/nodes/COM_ZCombineNode.cpp
index 8f512769d63..25d9a6e97d2 100644
--- a/source/blender/compositor/nodes/COM_ZCombineNode.cpp
+++ b/source/blender/compositor/nodes/COM_ZCombineNode.cpp
@@ -30,7 +30,8 @@
 
 #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;
 		if (this->getbNode()->custom1) {
diff --git a/source/blender/compositor/nodes/COM_ZCombineNode.h b/source/blender/compositor/nodes/COM_ZCombineNode.h
index 0faf7df8725..e9ce2f27469 100644
--- a/source/blender/compositor/nodes/COM_ZCombineNode.h
+++ b/source/blender/compositor/nodes/COM_ZCombineNode.h
@@ -31,7 +31,7 @@
   */
 class ZCombineNode: public Node {
 public:
-	ZCombineNode(bNode* editorNode) :Node(editorNode) {}
+	ZCombineNode(bNode *editorNode) :Node(editorNode) {}
 	void convertToOperations(ExecutionSystem *graph, CompositorContext * context);
 };