style cleanup: nodes

32 files changed, 164 insertions, 175 deletions

diff --git a/source/blender/nodes/composite/nodes/node_composite_alphaOver.c b/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
index b1732a3b184..4677c092669 100644
--- a/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
+++ b/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
@@ -45,7 +45,7 @@ static bNodeSocketTemplate cmp_node_alphaover_out[] = {
 
 static void node_alphaover_init(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	node->storage= MEM_callocN(sizeof(NodeTwoFloats), "NodeTwoFloats");
+	node->storage = MEM_callocN(sizeof(NodeTwoFloats), "NodeTwoFloats");
 }
 
 void register_node_type_cmp_alphaover(void)
diff --git a/source/blender/nodes/composite/nodes/node_composite_bokehblur.c b/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
index a2d9e6e1473..bb794b4e6ce 100644
--- a/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
+++ b/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
diff --git a/source/blender/nodes/composite/nodes/node_composite_bokehimage.c b/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
index c04682c42a6..2a9b8f5eb94 100644
--- a/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
+++ b/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
@@ -1,32 +1,30 @@
 /*
-* $Id$
-*
-* ***** BEGIN GPL LICENSE BLOCK *****
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version. 
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software Foundation,
-* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-* 
-* The Original Code is Copyright (C) 2006 Blender Foundation.
-* All rights reserved.
-* 
-* The Original Code is: all of this file.
-* 
-* Contributor(s): none yet.
-* 
-* ***** END GPL LICENSE BLOCK *****
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2006 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
 
-*/
+ */
 
 /** \file blender/nodes/composite/nodes/node_composite_bokehimage.c
  *  \ingroup cmpnodes
@@ -44,7 +42,7 @@ static bNodeSocketTemplate cmp_node_bokehimage_out[] = {
 
 static void node_composit_init_bokehimage(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeBokehImage * data = MEM_callocN(sizeof(NodeBokehImage), "NodeBokehImage");
+	NodeBokehImage *data = MEM_callocN(sizeof(NodeBokehImage), "NodeBokehImage");
 	data->angle = 0.0f;
 	data->flaps = 5;
 	data->rounding = 0.0f;
@@ -57,7 +55,7 @@ void register_node_type_cmp_bokehimage(void)
 {
 	static bNodeType ntype;
 	
-	cmp_node_type_base(&ntype, CMP_NODE_BOKEHIMAGE, "Bokeh Image", NODE_CLASS_INPUT, NODE_PREVIEW|NODE_OPTIONS);
+	cmp_node_type_base(&ntype, CMP_NODE_BOKEHIMAGE, "Bokeh Image", NODE_CLASS_INPUT, NODE_PREVIEW | NODE_OPTIONS);
 	node_type_socket_templates(&ntype, NULL, cmp_node_bokehimage_out);
 	node_type_init(&ntype, node_composit_init_bokehimage);
 	node_type_storage(&ntype, "NodeBokehImage", node_free_standard_storage, node_copy_standard_storage);
diff --git a/source/blender/nodes/composite/nodes/node_composite_brightness.c b/source/blender/nodes/composite/nodes/node_composite_brightness.c
index 669668fa654..613df8e988b 100644
--- a/source/blender/nodes/composite/nodes/node_composite_brightness.c
+++ b/source/blender/nodes/composite/nodes/node_composite_brightness.c
@@ -23,8 +23,7 @@
  * Contributor(s): none yet.
  * 
  * ***** END GPL LICENSE BLOCK *****
-
-*/
+ */
 
 /** \file blender/nodes/composite/nodes/node_composite_brightness.c
  *  \ingroup cmpnodes
diff --git a/source/blender/nodes/composite/nodes/node_composite_channelMatte.c b/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
index 92cc55f511f..86f96404657 100644
--- a/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
@@ -47,24 +47,24 @@ static bNodeSocketTemplate cmp_node_channel_matte_out[] = {
 
 static void node_composit_init_channel_matte(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeChroma *c= MEM_callocN(sizeof(NodeChroma), "node chroma");
-	node->storage=c;
-	c->t1= 1.0f;
-	c->t2= 0.0f;
-	c->t3= 0.0f;
-	c->fsize= 0.0f;
-	c->fstrength= 0.0f;
-	c->algorithm=1; /*max channel limiting */
-	c->channel=1; /* limit by red */
-	node->custom1= 1; /* RGB channel */
-	node->custom2= 2; /* Green Channel */
+	NodeChroma *c = MEM_callocN(sizeof(NodeChroma), "node chroma");
+	node->storage = c;
+	c->t1 = 1.0f;
+	c->t2 = 0.0f;
+	c->t3 = 0.0f;
+	c->fsize = 0.0f;
+	c->fstrength = 0.0f;
+	c->algorithm = 1; /*max channel limiting */
+	c->channel = 1; /* limit by red */
+	node->custom1 = 1; /* RGB channel */
+	node->custom2 = 2; /* Green Channel */
 }
 
 void register_node_type_cmp_channel_matte(void)
 {
 	static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_CHANNEL_MATTE, "Channel Key", NODE_CLASS_MATTE, NODE_PREVIEW|NODE_OPTIONS);
+	cmp_node_type_base(&ntype, CMP_NODE_CHANNEL_MATTE, "Channel Key", NODE_CLASS_MATTE, NODE_PREVIEW | NODE_OPTIONS);
 	node_type_socket_templates(&ntype, cmp_node_channel_matte_in, cmp_node_channel_matte_out);
 	node_type_init(&ntype, node_composit_init_channel_matte);
 	node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);
diff --git a/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c b/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
index 2e04ddb4f9f..f4653b6f56f 100644
--- a/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
@@ -47,20 +47,20 @@ static bNodeSocketTemplate cmp_node_chroma_out[] = {
 
 static void node_composit_init_chroma_matte(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeChroma *c= MEM_callocN(sizeof(NodeChroma), "node chroma");
-	node->storage= c;
-	c->t1= DEG2RADF(30.0f);
-	c->t2= DEG2RADF(10.0f);
-	c->t3= 0.0f;
-	c->fsize= 0.0f;
-	c->fstrength= 1.0f;
+	NodeChroma *c = MEM_callocN(sizeof(NodeChroma), "node chroma");
+	node->storage = c;
+	c->t1 = DEG2RADF(30.0f);
+	c->t2 = DEG2RADF(10.0f);
+	c->t3 = 0.0f;
+	c->fsize = 0.0f;
+	c->fstrength = 1.0f;
 }
 
 void register_node_type_cmp_chroma_matte(void)
 {
 	static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_CHROMA_MATTE, "Chroma Key", NODE_CLASS_MATTE, NODE_PREVIEW|NODE_OPTIONS);
+	cmp_node_type_base(&ntype, CMP_NODE_CHROMA_MATTE, "Chroma Key", NODE_CLASS_MATTE, NODE_PREVIEW | NODE_OPTIONS);
 	node_type_socket_templates(&ntype, cmp_node_chroma_in, cmp_node_chroma_out);
 	node_type_init(&ntype, node_composit_init_chroma_matte);
 	node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);
diff --git a/source/blender/nodes/composite/nodes/node_composite_colorMatte.c b/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
index 2ecb5e3fb7c..5d5779e4fc0 100644
--- a/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
@@ -47,20 +47,20 @@ static bNodeSocketTemplate cmp_node_color_out[] = {
 
 static void node_composit_init_color_matte(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeChroma *c= MEM_callocN(sizeof(NodeChroma), "node color");
-	node->storage= c;
-	c->t1= 0.01f;
-	c->t2= 0.1f;
-	c->t3= 0.1f;
-	c->fsize= 0.0f;
-	c->fstrength= 1.0f;
+	NodeChroma *c = MEM_callocN(sizeof(NodeChroma), "node color");
+	node->storage = c;
+	c->t1 = 0.01f;
+	c->t2 = 0.1f;
+	c->t3 = 0.1f;
+	c->fsize = 0.0f;
+	c->fstrength = 1.0f;
 }
 
 void register_node_type_cmp_color_matte(void)
 {
 	static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_COLOR_MATTE, "Color Key", NODE_CLASS_MATTE, NODE_PREVIEW|NODE_OPTIONS);
+	cmp_node_type_base(&ntype, CMP_NODE_COLOR_MATTE, "Color Key", NODE_CLASS_MATTE, NODE_PREVIEW | NODE_OPTIONS);
 	node_type_socket_templates(&ntype, cmp_node_color_in, cmp_node_color_out);
 	node_type_init(&ntype, node_composit_init_color_matte);
 	node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);
diff --git a/source/blender/nodes/composite/nodes/node_composite_colorSpill.c b/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
index 5cdb7b016cd..d0a6a7b9243 100644
--- a/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
+++ b/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
@@ -45,13 +45,13 @@ static bNodeSocketTemplate cmp_node_color_spill_out[] = {
 
 static void node_composit_init_color_spill(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeColorspill *ncs= MEM_callocN(sizeof(NodeColorspill), "node colorspill");
-	node->storage=ncs;
-	node->custom1= 2; /* green channel */
-	node->custom2= 0; /* simple limit algo*/
-	ncs->limchan= 0;  /* limit by red */
-	ncs->limscale= 1.0f; /* limit scaling factor */
-	ncs->unspill=0;   /* do not use unspill */
+	NodeColorspill *ncs = MEM_callocN(sizeof(NodeColorspill), "node colorspill");
+	node->storage = ncs;
+	node->custom1 = 2; /* green channel */
+	node->custom2 = 0; /* simple limit algo*/
+	ncs->limchan = 0;  /* limit by red */
+	ncs->limscale = 1.0f; /* limit scaling factor */
+	ncs->unspill = 0;   /* do not use unspill */
 }
 
 void register_node_type_cmp_color_spill(void)
diff --git a/source/blender/nodes/composite/nodes/node_composite_colorbalance.c b/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
index 0ab819d6683..bc077ae94fd 100644
--- a/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
+++ b/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
@@ -48,7 +48,7 @@ static bNodeSocketTemplate cmp_node_colorbalance_out[] = {
 
 static void node_composit_init_colorbalance(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeColorBalance *n= node->storage= MEM_callocN(sizeof(NodeColorBalance), "node colorbalance");
+	NodeColorBalance *n = node->storage = MEM_callocN(sizeof(NodeColorBalance), "node colorbalance");
 
 	n->lift[0] = n->lift[1] = n->lift[2] = 1.0f;
 	n->gamma[0] = n->gamma[1] = n->gamma[2] = 1.0f;
diff --git a/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c b/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
index e122bd51ec6..035ff987124 100644
--- a/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
+++ b/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
@@ -49,29 +49,29 @@ static bNodeSocketTemplate cmp_node_colorcorrection_out[] = {
 
 static void node_composit_init_colorcorrection(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeColorCorrection *n= node->storage= MEM_callocN(sizeof(NodeColorCorrection), "node colorcorrection");
+	NodeColorCorrection *n = node->storage = MEM_callocN(sizeof(NodeColorCorrection), "node colorcorrection");
 	n->startmidtones = 0.2f;
 	n->endmidtones = 0.7f;
 	n->master.contrast = 1.0f;
 	n->master.gain = 1.0f;
 	n->master.gamma = 1.0f;
-	n->master.lift= 0.0f;
-	n->master.saturation= 1.0f;
+	n->master.lift = 0.0f;
+	n->master.saturation = 1.0f;
 	n->midtones.contrast = 1.0f;
 	n->midtones.gain = 1.0f;
 	n->midtones.gamma = 1.0f;
-	n->midtones.lift= 0.0f;
-	n->midtones.saturation= 1.0f;
+	n->midtones.lift = 0.0f;
+	n->midtones.saturation = 1.0f;
 	n->shadows.contrast = 1.0f;
 	n->shadows.gain = 1.0f;
 	n->shadows.gamma = 1.0f;
-	n->shadows.lift= 0.0f;
-	n->shadows.saturation= 1.0f;
+	n->shadows.lift = 0.0f;
+	n->shadows.saturation = 1.0f;
 	n->highlights.contrast = 1.0f;
 	n->highlights.gain = 1.0f;
 	n->highlights.gamma = 1.0f;
-	n->highlights.lift= 0.0f;
-	n->highlights.saturation= 1.0f;
+	n->highlights.lift = 0.0f;
+	n->highlights.saturation = 1.0f;
 	node->custom1 = 7; // red + green + blue enabled
 }
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_crop.c b/source/blender/nodes/composite/nodes/node_composite_crop.c
index 677dafeb527..101a3ba0066 100644
--- a/source/blender/nodes/composite/nodes/node_composite_crop.c
+++ b/source/blender/nodes/composite/nodes/node_composite_crop.c
@@ -45,12 +45,12 @@ static bNodeSocketTemplate cmp_node_crop_out[] = {
 
 static void node_composit_init_crop(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeTwoXYs *nxy= MEM_callocN(sizeof(NodeTwoXYs), "node xy data");
-	node->storage= nxy;
-	nxy->x1= 0;
-	nxy->x2= 0;
-	nxy->y1= 0;
-	nxy->y2= 0;
+	NodeTwoXYs *nxy = MEM_callocN(sizeof(NodeTwoXYs), "node xy data");
+	node->storage = nxy;
+	nxy->x1 = 0;
+	nxy->x2 = 0;
+	nxy->y1 = 0;
+	nxy->y2 = 0;
 }
 
 void register_node_type_cmp_crop(void)
diff --git a/source/blender/nodes/composite/nodes/node_composite_curves.c b/source/blender/nodes/composite/nodes/node_composite_curves.c
index 483965f4adf..a72eb4d9fc9 100644
--- a/source/blender/nodes/composite/nodes/node_composite_curves.c
+++ b/source/blender/nodes/composite/nodes/node_composite_curves.c
@@ -43,9 +43,9 @@ static bNodeSocketTemplate cmp_node_time_out[] = {
 
 static void node_composit_init_curves_time(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	node->custom1= 1;
-	node->custom2= 250;
-	node->storage= curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
+	node->custom1 = 1;
+	node->custom2 = 250;
+	node->storage = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
 }
 
 void register_node_type_cmp_curve_time(void)
@@ -76,7 +76,7 @@ static bNodeSocketTemplate cmp_node_curve_vec_out[] = {
 
 static void node_composit_init_curve_vec(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	node->storage= curvemapping_add(3, -1.0f, -1.0f, 1.0f, 1.0f);
+	node->storage = curvemapping_add(3, -1.0f, -1.0f, 1.0f, 1.0f);
 }
 
 void register_node_type_cmp_curve_vec(void)
@@ -109,7 +109,7 @@ static bNodeSocketTemplate cmp_node_curve_rgb_out[] = {
 
 static void node_composit_init_curve_rgb(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	node->storage= curvemapping_add(4, 0.0f, 0.0f, 1.0f, 1.0f);
+	node->storage = curvemapping_add(4, 0.0f, 0.0f, 1.0f, 1.0f);
 }
 
 void register_node_type_cmp_curve_rgb(void)
diff --git a/source/blender/nodes/composite/nodes/node_composite_despeckle.c b/source/blender/nodes/composite/nodes/node_composite_despeckle.c
index 35539082556..22ab62a11a8 100644
--- a/source/blender/nodes/composite/nodes/node_composite_despeckle.c
+++ b/source/blender/nodes/composite/nodes/node_composite_despeckle.c
@@ -52,7 +52,7 @@ void register_node_type_cmp_despeckle(void)
 {
 	static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_DESPECKLE, "Despeckle", NODE_CLASS_OP_FILTER, NODE_PREVIEW|NODE_OPTIONS);
+	cmp_node_type_base(&ntype, CMP_NODE_DESPECKLE, "Despeckle", NODE_CLASS_OP_FILTER, NODE_PREVIEW | NODE_OPTIONS);
 	node_type_socket_templates(&ntype, cmp_node_despeckle_in, cmp_node_despeckle_out);
 	node_type_init(&ntype, node_composit_init_despeckle);
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_diffMatte.c b/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
index 99170c294de..87fae0e7630 100644
--- a/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
@@ -47,17 +47,17 @@ static bNodeSocketTemplate cmp_node_diff_matte_out[] = {
 
 static void node_composit_init_diff_matte(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeChroma *c= MEM_callocN(sizeof(NodeChroma), "node chroma");
-	node->storage= c;
-	c->t1= 0.1f;
-	c->t2= 0.1f;
+	NodeChroma *c = MEM_callocN(sizeof(NodeChroma), "node chroma");
+	node->storage = c;
+	c->t1 = 0.1f;
+	c->t2 = 0.1f;
 }
 
 void register_node_type_cmp_diff_matte(void)
 {
 	static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_DIFF_MATTE, "Difference Key", NODE_CLASS_MATTE, NODE_PREVIEW|NODE_OPTIONS);
+	cmp_node_type_base(&ntype, CMP_NODE_DIFF_MATTE, "Difference Key", NODE_CLASS_MATTE, NODE_PREVIEW | NODE_OPTIONS);
 	node_type_socket_templates(&ntype, cmp_node_diff_matte_in, cmp_node_diff_matte_out);
 	node_type_init(&ntype, node_composit_init_diff_matte);
 	node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);
diff --git a/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c b/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
index b75301676e6..53f61c5bdf7 100644
--- a/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
@@ -47,18 +47,18 @@ static bNodeSocketTemplate cmp_node_distance_matte_out[] = {
 
 static void node_composit_init_distance_matte(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeChroma *c= MEM_callocN(sizeof(NodeChroma), "node chroma");
-	node->storage= c;
-	c->channel=1;
-	c->t1= 0.1f;
-	c->t2= 0.1f;
+	NodeChroma *c = MEM_callocN(sizeof(NodeChroma), "node chroma");
+	node->storage = c;
+	c->channel = 1;
+	c->t1 = 0.1f;
+	c->t2 = 0.1f;
 }
 
 void register_node_type_cmp_distance_matte(void)
 {
 	static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_DIST_MATTE, "Distance Key", NODE_CLASS_MATTE, NODE_PREVIEW|NODE_OPTIONS);
+	cmp_node_type_base(&ntype, CMP_NODE_DIST_MATTE, "Distance Key", NODE_CLASS_MATTE, NODE_PREVIEW | NODE_OPTIONS);
 	node_type_socket_templates(&ntype, cmp_node_distance_matte_in, cmp_node_distance_matte_out);
 	node_type_init(&ntype, node_composit_init_distance_matte);
 	node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);
diff --git a/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c b/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
index c4a01abc6d1..9c9782fe271 100644
--- a/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
+++ b/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
@@ -67,7 +67,3 @@ void register_node_type_cmp_ellipsemask(void)
 
 	nodeRegisterType(&ntype);
 }
-
-
-
-
diff --git a/source/blender/nodes/composite/nodes/node_composite_filter.c b/source/blender/nodes/composite/nodes/node_composite_filter.c
index 16adbc8d53c..93c7c2230a4 100644
--- a/source/blender/nodes/composite/nodes/node_composite_filter.c
+++ b/source/blender/nodes/composite/nodes/node_composite_filter.c
@@ -47,7 +47,7 @@ void register_node_type_cmp_filter(void)
 {
 	static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_FILTER, "Filter", NODE_CLASS_OP_FILTER, NODE_PREVIEW|NODE_OPTIONS);
+	cmp_node_type_base(&ntype, CMP_NODE_FILTER, "Filter", NODE_CLASS_OP_FILTER, NODE_PREVIEW | NODE_OPTIONS);
 	node_type_socket_templates(&ntype, cmp_node_filter_in, cmp_node_filter_out);
 	node_type_label(&ntype, node_filter_label);
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_gamma.c b/source/blender/nodes/composite/nodes/node_composite_gamma.c
index 27bf72d53b4..26bd4ce9a68 100644
--- a/source/blender/nodes/composite/nodes/node_composite_gamma.c
+++ b/source/blender/nodes/composite/nodes/node_composite_gamma.c
@@ -23,8 +23,7 @@
  * Contributor(s): none yet.
  * 
  * ***** END GPL LICENSE BLOCK *****
-
-*/
+ */
 
 /** \file blender/nodes/composite/nodes/node_composite_gamma.c
  *  \ingroup cmpnodes
diff --git a/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c b/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
index f499dec1224..79e099c01d0 100644
--- a/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
+++ b/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
@@ -46,11 +46,11 @@ static bNodeSocketTemplate cmp_node_hue_sat_out[] = {
 
 static void node_composit_init_hue_sat(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeHueSat *nhs= MEM_callocN(sizeof(NodeHueSat), "node hue sat");
-	node->storage= nhs;
-	nhs->hue= 0.5f;
-	nhs->sat= 1.0f;
-	nhs->val= 1.0f;
+	NodeHueSat *nhs = MEM_callocN(sizeof(NodeHueSat), "node hue sat");
+	node->storage = nhs;
+	nhs->hue = 0.5f;
+	nhs->sat = 1.0f;
+	nhs->val = 1.0f;
 }
 
 void register_node_type_cmp_hue_sat(void)
diff --git a/source/blender/nodes/composite/nodes/node_composite_huecorrect.c b/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
index 91e5a2d865a..28e5e4271b7 100644
--- a/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
+++ b/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
@@ -45,12 +45,12 @@ static bNodeSocketTemplate cmp_node_huecorrect_out[] = {
 
 static void node_composit_init_huecorrect(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	CurveMapping *cumapping = node->storage= curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
+	CurveMapping *cumapping = node->storage = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
 	int c;
 	
 	cumapping->preset = CURVE_PRESET_MID9;
 	
-	for (c=0; c<3; c++) {
+	for (c = 0; c < 3; c++) {
 		CurveMap *cuma = &cumapping->cm[c];
 		curvemap_reset(cuma, &cumapping->clipr, cumapping->preset, CURVEMAP_SLOPE_POSITIVE);
 	}
diff --git a/source/blender/nodes/composite/nodes/node_composite_image.c b/source/blender/nodes/composite/nodes/node_composite_image.c
index 9b0a435f9a9..b9f67bb170d 100644
--- a/source/blender/nodes/composite/nodes/node_composite_image.c
+++ b/source/blender/nodes/composite/nodes/node_composite_image.c
@@ -153,7 +153,7 @@ static void cmp_node_image_add_multilayer_outputs(bNodeTree *ntree, bNode *node,
 	NodeImageLayer *sockdata;
 	RenderPass *rpass;
 	int index;
-	for (rpass=rl->passes.first, index=0; rpass; rpass=rpass->next, ++index) {
+	for (rpass = rl->passes.first, index = 0; rpass; rpass = rpass->next, ++index) {
 		int type;
 		if (rpass->channels == 1)
 			type = SOCK_FLOAT;
@@ -172,7 +172,7 @@ static void cmp_node_image_add_multilayer_outputs(bNodeTree *ntree, bNode *node,
 
 static void cmp_node_image_create_outputs(bNodeTree *ntree, bNode *node)
 {
-	Image *ima= (Image *)node->id;
+	Image *ima = (Image *)node->id;
 	if (ima) {
 		ImageUser *iuser = node->storage;
 		ImageUser load_iuser = {NULL};
@@ -194,31 +194,31 @@ static void cmp_node_image_create_outputs(bNodeTree *ntree, bNode *node)
 		ibuf = BKE_image_acquire_ibuf(ima, &load_iuser, NULL);
 		
 		if (ima->rr) {
-			RenderLayer *rl= BLI_findlink(&ima->rr->layers, iuser->layer);
+			RenderLayer *rl = BLI_findlink(&ima->rr->layers, iuser->layer);
 			
 			if (rl) {
-				if (ima->type!=IMA_TYPE_MULTILAYER)
+				if (ima->type != IMA_TYPE_MULTILAYER)
 					cmp_node_image_add_render_pass_outputs(ntree, node, rl->passflag);
 				else
 					cmp_node_image_add_multilayer_outputs(ntree, node, rl);
 			}
 			else
-				cmp_node_image_add_render_pass_outputs(ntree, node, RRES_OUT_IMAGE|RRES_OUT_ALPHA);
+				cmp_node_image_add_render_pass_outputs(ntree, node, RRES_OUT_IMAGE | RRES_OUT_ALPHA);
 		}
 		else
-			cmp_node_image_add_render_pass_outputs(ntree, node, RRES_OUT_IMAGE|RRES_OUT_ALPHA|RRES_OUT_Z);
+			cmp_node_image_add_render_pass_outputs(ntree, node, RRES_OUT_IMAGE | RRES_OUT_ALPHA | RRES_OUT_Z);
 		
 		BKE_image_release_ibuf(ima, ibuf, NULL);
 	}
 	else
-		cmp_node_image_add_render_pass_outputs(ntree, node, RRES_OUT_IMAGE|RRES_OUT_ALPHA);
+		cmp_node_image_add_render_pass_outputs(ntree, node, RRES_OUT_IMAGE | RRES_OUT_ALPHA);
 }
 
 static bNodeSocket *cmp_node_image_output_find_match(bNode *UNUSED(node), bNodeSocket *newsock, ListBase *oldsocklist)
 {
 	bNodeSocket *sock;
 	
-	for (sock=oldsocklist->first; sock; sock = sock->next)
+	for (sock = oldsocklist->first; sock; sock = sock->next)
 		if (STREQ(sock->name, newsock->name))
 			return sock;
 	return NULL;
@@ -257,7 +257,7 @@ static void cmp_node_image_verify_outputs(bNodeTree *ntree, bNode *node)
 	/* XXX make callback */
 	cmp_node_image_create_outputs(ntree, node);
 	
-	for (newsock = node->outputs.first; newsock; newsock=newsock->next) {
+	for (newsock = node->outputs.first; newsock; newsock = newsock->next) {
 		/* XXX make callback */
 		oldsock = cmp_node_image_output_find_match(node, newsock, &oldsocklist);
 		if (oldsock) {
@@ -267,11 +267,11 @@ static void cmp_node_image_verify_outputs(bNodeTree *ntree, bNode *node)
 	}
 	
 	/* move links to new socket */
-	for (oldsock=oldsocklist.first, oldindex=0; oldsock; oldsock=oldsock->next, ++oldindex) {
+	for (oldsock = oldsocklist.first, oldindex = 0; oldsock; oldsock = oldsock->next, ++oldindex) {
 		newsock = cmp_node_image_output_relink(node, oldsock, oldindex);
 		
 		if (newsock) {
-			for (link=ntree->links.first; link; link=link->next) {
+			for (link = ntree->links.first; link; link = link->next) {
 				if (link->fromsock == oldsock)
 					link->fromsock = newsock;
 			}
@@ -283,7 +283,7 @@ static void cmp_node_image_verify_outputs(bNodeTree *ntree, bNode *node)
 	 * but the nodeRemoveSocket function works anyway. In future this
 	 * should become part of the core code, so can take care of this behavior.
 	 */
-	for (oldsock=oldsocklist.first; oldsock; oldsock=oldsock_next) {
+	for (oldsock = oldsocklist.first; oldsock; oldsock = oldsock_next) {
 		oldsock_next = oldsock->next;
 		MEM_freeN(oldsock->storage);
 		nodeRemoveSocket(ntree, node, oldsock);
@@ -299,12 +299,12 @@ static void cmp_node_image_update(bNodeTree *ntree, bNode *node)
 
 static void node_composit_init_image(bNodeTree *ntree, bNode *node)
 {
-	ImageUser *iuser= MEM_callocN(sizeof(ImageUser), "node image user");
-	node->storage= iuser;
-	iuser->frames= 1;
-	iuser->sfra= 1;
-	iuser->fie_ima= 2;
-	iuser->ok= 1;
+	ImageUser *iuser = MEM_callocN(sizeof(ImageUser), "node image user");
+	node->storage = iuser;
+	iuser->frames = 1;
+	iuser->sfra = 1;
+	iuser->fie_ima = 2;
+	iuser->ok = 1;
 	
 	/* setup initial outputs */
 	cmp_node_image_verify_outputs(ntree, node);
@@ -325,10 +325,10 @@ static void node_composit_copy_image(bNodeTree *UNUSED(dest_ntree), bNode *dest_
 {
 	bNodeSocket *sock;
 	
-	dest_node->storage= MEM_dupallocN(src_node->storage);
+	dest_node->storage = MEM_dupallocN(src_node->storage);
 	
 	/* copy extra socket info */
-	for (sock=src_node->outputs.first; sock; sock = sock->next)
+	for (sock = src_node->outputs.first; sock; sock = sock->next)
 		sock->new_sock->storage = MEM_dupallocN(sock->storage);
 }
 
@@ -336,7 +336,7 @@ void register_node_type_cmp_image(void)
 {
 	static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_IMAGE, "Image", NODE_CLASS_INPUT, NODE_PREVIEW|NODE_OPTIONS);
+	cmp_node_type_base(&ntype, CMP_NODE_IMAGE, "Image", NODE_CLASS_INPUT, NODE_PREVIEW | NODE_OPTIONS);
 	node_type_init(&ntype, node_composit_init_image);
 	node_type_storage(&ntype, "ImageUser", node_composit_free_image, node_composit_copy_image);
 	node_type_update(&ntype, cmp_node_image_update, NULL);
@@ -349,7 +349,7 @@ void register_node_type_cmp_image(void)
 
 static int node_composit_poll_rlayers(bNodeType *UNUSED(ntype), bNodeTree *ntree)
 {
-	if (strcmp(ntree->idname, "CompositorNodeTree")==0) {
+	if (strcmp(ntree->idname, "CompositorNodeTree") == 0) {
 		Scene *scene;
 		
 		/* XXX ugly: check if ntree is a local scene node tree.
@@ -369,7 +369,7 @@ void register_node_type_cmp_rlayers(void)
 {
 	static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_R_LAYERS, "Render Layers", NODE_CLASS_INPUT, NODE_PREVIEW|NODE_OPTIONS);
+	cmp_node_type_base(&ntype, CMP_NODE_R_LAYERS, "Render Layers", NODE_CLASS_INPUT, NODE_PREVIEW | NODE_OPTIONS);
 	node_type_socket_templates(&ntype, NULL, cmp_node_rlayers_out);
 	ntype.poll = node_composit_poll_rlayers;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_levels.c b/source/blender/nodes/composite/nodes/node_composite_levels.c
index e2b3895a96f..bc42e62cf3a 100644
--- a/source/blender/nodes/composite/nodes/node_composite_levels.c
+++ b/source/blender/nodes/composite/nodes/node_composite_levels.c
@@ -47,14 +47,14 @@ static bNodeSocketTemplate cmp_node_view_levels_out[] = {
 
 static void node_composit_init_view_levels(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	node->custom1=1; /*All channels*/
+	node->custom1 = 1; /*All channels*/
 }
 
 void register_node_type_cmp_view_levels(void)
 {
 	static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_VIEW_LEVELS, "Levels", NODE_CLASS_OUTPUT, NODE_OPTIONS|NODE_PREVIEW);
+	cmp_node_type_base(&ntype, CMP_NODE_VIEW_LEVELS, "Levels", NODE_CLASS_OUTPUT, NODE_OPTIONS | NODE_PREVIEW);
 	node_type_socket_templates(&ntype, cmp_node_view_levels_in, cmp_node_view_levels_out);
 	node_type_init(&ntype, node_composit_init_view_levels);
 	node_type_storage(&ntype, "ImageUser", NULL, NULL);
diff --git a/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c b/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
index 606c95b495d..f178eee582f 100644
--- a/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
@@ -47,17 +47,17 @@ static bNodeSocketTemplate cmp_node_luma_matte_out[] = {
 
 static void node_composit_init_luma_matte(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeChroma *c= MEM_callocN(sizeof(NodeChroma), "node chroma");
-	node->storage=c;
-	c->t1= 1.0f;
-	c->t2= 0.0f;
+	NodeChroma *c = MEM_callocN(sizeof(NodeChroma), "node chroma");
+	node->storage = c;
+	c->t1 = 1.0f;
+	c->t2 = 0.0f;
 }
 
 void register_node_type_cmp_luma_matte(void)
 {
 	static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_LUMA_MATTE, "Luminance Key", NODE_CLASS_MATTE, NODE_PREVIEW|NODE_OPTIONS);
+	cmp_node_type_base(&ntype, CMP_NODE_LUMA_MATTE, "Luminance Key", NODE_CLASS_MATTE, NODE_PREVIEW | NODE_OPTIONS);
 	node_type_socket_templates(&ntype, cmp_node_luma_matte_in, cmp_node_luma_matte_out);
 	node_type_init(&ntype, node_composit_init_luma_matte);
 	node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);
diff --git a/source/blender/nodes/composite/nodes/node_composite_mapValue.c b/source/blender/nodes/composite/nodes/node_composite_mapValue.c
index a61ecd41746..caccb4eb1ff 100644
--- a/source/blender/nodes/composite/nodes/node_composite_mapValue.c
+++ b/source/blender/nodes/composite/nodes/node_composite_mapValue.c
@@ -44,7 +44,7 @@ static bNodeSocketTemplate cmp_node_map_value_out[] = {
 
 static void node_composit_init_map_value(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	node->storage= add_tex_mapping();
+	node->storage = add_tex_mapping();
 }
 
 void register_node_type_cmp_map_value(void)
diff --git a/source/blender/nodes/composite/nodes/node_composite_mixrgb.c b/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
index e9c3e4fd6e0..478c01cea2e 100644
--- a/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
+++ b/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
@@ -48,7 +48,7 @@ void register_node_type_cmp_mix_rgb(void)
 {
 	static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_MIX_RGB, "Mix", NODE_CLASS_OP_COLOR, NODE_PREVIEW|NODE_OPTIONS);
+	cmp_node_type_base(&ntype, CMP_NODE_MIX_RGB, "Mix", NODE_CLASS_OP_COLOR, NODE_PREVIEW | NODE_OPTIONS);
 	node_type_socket_templates(&ntype, cmp_node_mix_rgb_in, cmp_node_mix_rgb_out);
 	node_type_label(&ntype, node_blend_label);
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_movieclip.c b/source/blender/nodes/composite/nodes/node_composite_movieclip.c
index 2369bf221e6..933dfccd1d5 100644
--- a/source/blender/nodes/composite/nodes/node_composite_movieclip.c
+++ b/source/blender/nodes/composite/nodes/node_composite_movieclip.c
@@ -55,7 +55,7 @@ void register_node_type_cmp_movieclip(void)
 {
 	static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_MOVIECLIP, "Movie Clip", NODE_CLASS_INPUT, NODE_PREVIEW|NODE_OPTIONS);
+	cmp_node_type_base(&ntype, CMP_NODE_MOVIECLIP, "Movie Clip", NODE_CLASS_INPUT, NODE_PREVIEW | NODE_OPTIONS);
 	node_type_socket_templates(&ntype, NULL, cmp_node_movieclip_out);
 	node_type_init(&ntype, init);
 	node_type_storage(&ntype, "MovieClipUser", node_free_standard_storage, node_copy_standard_storage);
diff --git a/source/blender/nodes/composite/nodes/node_composite_outputFile.c b/source/blender/nodes/composite/nodes/node_composite_outputFile.c
index 18bb97c70ed..57e98f0075a 100644
--- a/source/blender/nodes/composite/nodes/node_composite_outputFile.c
+++ b/source/blender/nodes/composite/nodes/node_composite_outputFile.c
@@ -51,9 +51,9 @@
 /* find unique path */
 static bool unique_path_unique_check(void *arg, const char *name)
 {
-	struct {ListBase *lb; bNodeSocket *sock;} *data= arg;
+	struct {ListBase *lb; bNodeSocket *sock; } *data = arg;
 	bNodeSocket *sock;
-	for (sock=data->lb->first; sock; sock = sock->next) {
+	for (sock = data->lb->first; sock; sock = sock->next) {
 		if (sock != data->sock) {
 			NodeImageMultiFileSocket *sockdata = sock->storage;
 			if (STREQ(sockdata->path, name))
@@ -65,7 +65,7 @@ static bool unique_path_unique_check(void *arg, const char *name)
 void ntreeCompositOutputFileUniquePath(ListBase *list, bNodeSocket *sock, const char defname[], char delim)
 {
 	NodeImageMultiFileSocket *sockdata;
-	struct {ListBase *lb; bNodeSocket *sock;} data;
+	struct {ListBase *lb; bNodeSocket *sock; } data;
 	data.lb = list;
 	data.sock = sock;
 
@@ -80,9 +80,9 @@ void ntreeCompositOutputFileUniquePath(ListBase *list, bNodeSocket *sock, const
 /* find unique EXR layer */
 static bool unique_layer_unique_check(void *arg, const char *name)
 {
-	struct {ListBase *lb; bNodeSocket *sock;} *data= arg;
+	struct {ListBase *lb; bNodeSocket *sock; } *data = arg;
 	bNodeSocket *sock;
-	for (sock=data->lb->first; sock; sock = sock->next) {
+	for (sock = data->lb->first; sock; sock = sock->next) {
 		if (sock != data->sock) {
 			NodeImageMultiFileSocket *sockdata = sock->storage;
 			if (STREQ(sockdata->layer, name))
@@ -94,7 +94,7 @@ static bool unique_layer_unique_check(void *arg, const char *name)
 void ntreeCompositOutputFileUniqueLayer(ListBase *list, bNodeSocket *sock, const char defname[], char delim)
 {
 	NodeImageMultiFileSocket *sockdata;
-	struct {ListBase *lb; bNodeSocket *sock;} data;
+	struct {ListBase *lb; bNodeSocket *sock; } data;
 	data.lb = list;
 	data.sock = sock;
 
@@ -121,9 +121,9 @@ bNodeSocket *ntreeCompositOutputFileAddSocket(bNodeTree *ntree, bNode *node, con
 	ntreeCompositOutputFileUniqueLayer(&node->inputs, sock, name, '_');
 	
 	if (im_format) {
-		sockdata->format= *im_format;
+		sockdata->format = *im_format;
 		if (BKE_imtype_is_movie(sockdata->format.imtype)) {
-			sockdata->format.imtype= R_IMF_IMTYPE_OPENEXR;
+			sockdata->format.imtype = R_IMF_IMTYPE_OPENEXR;
 		}
 	}
 	else
@@ -145,7 +145,7 @@ int ntreeCompositOutputFileRemoveActiveSocket(bNodeTree *ntree, bNode *node)
 	if (!sock)
 		return 0;
 	
-	if (nimf->active_input == totinputs-1)
+	if (nimf->active_input == totinputs - 1)
 		--nimf->active_input;
 	
 	/* free format data */
@@ -175,9 +175,9 @@ static void init_output_file(const bContext *C, PointerRNA *ptr)
 	Scene *scene = CTX_data_scene(C);
 	bNodeTree *ntree = ptr->id.data;
 	bNode *node = ptr->data;
-	NodeImageMultiFile *nimf= MEM_callocN(sizeof(NodeImageMultiFile), "node image multi file");
+	NodeImageMultiFile *nimf = MEM_callocN(sizeof(NodeImageMultiFile), "node image multi file");
 	ImageFormatData *format = NULL;
-	node->storage= nimf;
+	node->storage = nimf;
 	
 	if (scene) {
 		RenderData *rd = &scene->r;
@@ -185,7 +185,7 @@ static void init_output_file(const bContext *C, PointerRNA *ptr)
 		BLI_strncpy(nimf->base_path, rd->pic, sizeof(nimf->base_path));
 		nimf->format = rd->im_format;
 		if (BKE_imtype_is_movie(nimf->format.imtype)) {
-			nimf->format.imtype= R_IMF_IMTYPE_OPENEXR;
+			nimf->format.imtype = R_IMF_IMTYPE_OPENEXR;
 		}
 		
 		format = &nimf->format;
@@ -216,7 +216,7 @@ static void copy_output_file(bNodeTree *UNUSED(dest_ntree), bNode *dest_node, bN
 	dest_node->storage = MEM_dupallocN(src_node->storage);
 	
 	/* duplicate storage data in sockets */
-	for (src_sock=src_node->inputs.first, dest_sock=dest_node->inputs.first; src_sock && dest_sock; src_sock=src_sock->next, dest_sock=dest_sock->next) {
+	for (src_sock = src_node->inputs.first, dest_sock = dest_node->inputs.first; src_sock && dest_sock; src_sock = src_sock->next, dest_sock = dest_sock->next) {
 		dest_sock->storage = MEM_dupallocN(src_sock->storage);
 	}
 }
@@ -241,7 +241,7 @@ void register_node_type_cmp_output_file(void)
 {
 	static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_OUTPUT_FILE, "File Output", NODE_CLASS_OUTPUT, NODE_OPTIONS|NODE_PREVIEW);
+	cmp_node_type_base(&ntype, CMP_NODE_OUTPUT_FILE, "File Output", NODE_CLASS_OUTPUT, NODE_OPTIONS | NODE_PREVIEW);
 	node_type_socket_templates(&ntype, NULL, NULL);
 	ntype.initfunc_api = init_output_file;
 	node_type_storage(&ntype, "NodeImageMultiFile", free_output_file, copy_output_file);
diff --git a/source/blender/nodes/composite/nodes/node_composite_premulkey.c b/source/blender/nodes/composite/nodes/node_composite_premulkey.c
index bfc5a54cf73..83ce8c75c52 100644
--- a/source/blender/nodes/composite/nodes/node_composite_premulkey.c
+++ b/source/blender/nodes/composite/nodes/node_composite_premulkey.c
@@ -23,8 +23,7 @@
  * Contributor(s): none yet.
  * 
  * ***** END GPL LICENSE BLOCK *****
-
-*/
+ */
 
 /** \file blender/nodes/composite/nodes/node_composite_premulkey.c
  *  \ingroup cmpnodes
diff --git a/source/blender/nodes/composite/nodes/node_composite_rotate.c b/source/blender/nodes/composite/nodes/node_composite_rotate.c
index 1f51e25798d..9902d8d7536 100644
--- a/source/blender/nodes/composite/nodes/node_composite_rotate.c
+++ b/source/blender/nodes/composite/nodes/node_composite_rotate.c
@@ -46,7 +46,7 @@ static bNodeSocketTemplate cmp_node_rotate_out[] = {
 
 static void node_composit_init_rotate(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	node->custom1= 1; /* Bilinear Filter*/
+	node->custom1 = 1; /* Bilinear Filter*/
 }
 
 void register_node_type_cmp_rotate(void)
diff --git a/source/blender/nodes/composite/nodes/node_composite_splitViewer.c b/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
index 7cb1cf1d65d..1e833685442 100644
--- a/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
+++ b/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
@@ -41,19 +41,19 @@ static bNodeSocketTemplate cmp_node_splitviewer_in[] = {
 
 static void node_composit_init_splitviewer(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	ImageUser *iuser= MEM_callocN(sizeof(ImageUser), "node image user");
-	node->storage= iuser;
-	iuser->sfra= 1;
-	iuser->fie_ima= 2;
-	iuser->ok= 1;
-	node->custom1= 50;	/* default 50% split */
+	ImageUser *iuser = MEM_callocN(sizeof(ImageUser), "node image user");
+	node->storage = iuser;
+	iuser->sfra = 1;
+	iuser->fie_ima = 2;
+	iuser->ok = 1;
+	node->custom1 = 50;  /* default 50% split */
 }
 
 void register_node_type_cmp_splitviewer(void)
 {
 	static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_SPLITVIEWER, "Split Viewer", NODE_CLASS_OUTPUT, NODE_PREVIEW|NODE_OPTIONS);
+	cmp_node_type_base(&ntype, CMP_NODE_SPLITVIEWER, "Split Viewer", NODE_CLASS_OUTPUT, NODE_PREVIEW | NODE_OPTIONS);
 	node_type_socket_templates(&ntype, cmp_node_splitviewer_in, NULL);
 	node_type_init(&ntype, node_composit_init_splitviewer);
 	node_type_storage(&ntype, "ImageUser", node_free_standard_storage, node_copy_standard_storage);
diff --git a/source/blender/nodes/composite/nodes/node_composite_texture.c b/source/blender/nodes/composite/nodes/node_composite_texture.c
index 320b8f6aabe..efbe7dd2941 100644
--- a/source/blender/nodes/composite/nodes/node_composite_texture.c
+++ b/source/blender/nodes/composite/nodes/node_composite_texture.c
@@ -48,7 +48,7 @@ void register_node_type_cmp_texture(void)
 {
 	static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_TEXTURE, "Texture", NODE_CLASS_INPUT, NODE_OPTIONS|NODE_PREVIEW);
+	cmp_node_type_base(&ntype, CMP_NODE_TEXTURE, "Texture", NODE_CLASS_INPUT, NODE_OPTIONS | NODE_PREVIEW);
 	node_type_socket_templates(&ntype, cmp_node_texture_in, cmp_node_texture_out);
 
 	nodeRegisterType(&ntype);
diff --git a/source/blender/nodes/composite/nodes/node_composite_valToRgb.c b/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
index 45192cc6252..9288a1d13cf 100644
--- a/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
+++ b/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
@@ -46,7 +46,7 @@ static bNodeSocketTemplate cmp_node_valtorgb_out[] = {
 
 static void node_composit_init_valtorgb(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	node->storage= add_colorband(true);
+	node->storage = add_colorband(true);
 }
 
 void register_node_type_cmp_valtorgb(void)