code cleanup

156 files changed, 209 insertions, 209 deletions

diff --git a/source/blender/nodes/composite/node_composite_tree.c b/source/blender/nodes/composite/node_composite_tree.c
index d10ab9d8d49..200e5341868 100644
--- a/source/blender/nodes/composite/node_composite_tree.c
+++ b/source/blender/nodes/composite/node_composite_tree.c
@@ -107,7 +107,7 @@ static void free_node_cache(bNodeTree *UNUSED(ntree), bNode *node)
 static void free_cache(bNodeTree *ntree)
 {
 	bNode *node;
-	for (node= ntree->nodes.first; node; node= node->next)
+	for (node = ntree->nodes.first; node; node = node->next)
 		free_node_cache(ntree, node);
 }
 
@@ -117,7 +117,7 @@ static void localize(bNodeTree *localtree, bNodeTree *ntree)
 	bNode *node, *node_next;
 	bNodeSocket *sock;
 	
-	for (node= ntree->nodes.first; node; node= node->next) {
+	for (node = ntree->nodes.first; node; node = node->next) {
 		/* ensure new user input gets handled ok */
 		node->need_exec= 0;
 		node->new_node->original = node;
@@ -142,7 +142,7 @@ static void localize(bNodeTree *localtree, bNodeTree *ntree)
 	}
 	
 	/* replace muted nodes and reroute nodes by internal links */
-	for (node= localtree->nodes.first; node; node= node_next) {
+	for (node = localtree->nodes.first; node; node = node_next) {
 		node_next = node->next;
 		
 		if (node->flag & NODE_MUTED || node->type == NODE_REROUTE) {
@@ -217,7 +217,7 @@ static void update(bNodeTree *ntree)
 
 bNodeTreeType *ntreeType_Composite;
 
-void register_node_tree_type_cmp()
+void register_node_tree_type_cmp(void)
 {
 	bNodeTreeType *tt = ntreeType_Composite = MEM_callocN(sizeof(bNodeTreeType), "compositor node tree type");
 	
diff --git a/source/blender/nodes/composite/node_composite_util.c b/source/blender/nodes/composite/node_composite_util.c
index b125473d5fa..6209ca6aa4f 100644
--- a/source/blender/nodes/composite/node_composite_util.c
+++ b/source/blender/nodes/composite/node_composite_util.c
@@ -40,7 +40,7 @@ int cmp_node_poll_default(bNodeType *UNUSED(ntype), bNodeTree *ntree)
 void cmp_node_update_default(bNodeTree *UNUSED(ntree), bNode *node)
 {
 	bNodeSocket *sock;
-	for(sock= node->outputs.first; sock; sock= sock->next) {
+	for (sock= node->outputs.first; sock; sock= sock->next) {
 		if(sock->cache) {
 			//free_compbuf(sock->cache);
 			//sock->cache= NULL;
diff --git a/source/blender/nodes/composite/nodes/node_composite_alphaOver.c b/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
index d7c452e406e..cdfcf045e35 100644
--- a/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
+++ b/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
@@ -48,7 +48,7 @@ static void node_alphaover_init(bNodeTree *UNUSED(ntree), bNode *node)
 	node->storage= MEM_callocN(sizeof(NodeTwoFloats), "NodeTwoFloats");
 }
 
-void register_node_type_cmp_alphaover()
+void register_node_type_cmp_alphaover(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
index bb2f9023866..1f80df602df 100644
--- a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
+++ b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
@@ -51,7 +51,7 @@ static void node_composit_init_bilateralblur(bNodeTree *UNUSED(ntree), bNode *no
 	nbbd->sigma_space = 5.0;
 }
 
-void register_node_type_cmp_bilateralblur()
+void register_node_type_cmp_bilateralblur(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_blur.c b/source/blender/nodes/composite/nodes/node_composite_blur.c
index e531f1080cd..e544ec7d9d8 100644
--- a/source/blender/nodes/composite/nodes/node_composite_blur.c
+++ b/source/blender/nodes/composite/nodes/node_composite_blur.c
@@ -51,7 +51,7 @@ static void node_composit_init_blur(bNodeTree *UNUSED(ntree), bNode *node)
 	node->storage = data;
 }
 
-void register_node_type_cmp_blur()
+void register_node_type_cmp_blur(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_brightness.c b/source/blender/nodes/composite/nodes/node_composite_brightness.c
index babb753a98b..669668fa654 100644
--- a/source/blender/nodes/composite/nodes/node_composite_brightness.c
+++ b/source/blender/nodes/composite/nodes/node_composite_brightness.c
@@ -48,7 +48,7 @@ static bNodeSocketTemplate cmp_node_brightcontrast_out[] = {
 };
 
 
-void register_node_type_cmp_brightcontrast()
+void register_node_type_cmp_brightcontrast(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/composite/nodes/node_composite_channelMatte.c b/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
index b68bc066b12..92cc55f511f 100644
--- a/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
@@ -60,7 +60,7 @@ static void node_composit_init_channel_matte(bNodeTree *UNUSED(ntree), bNode *no
 	node->custom2= 2; /* Green Channel */
 }
 
-void register_node_type_cmp_channel_matte()
+void register_node_type_cmp_channel_matte(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c b/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
index f119c5ae04f..2e04ddb4f9f 100644
--- a/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
@@ -56,7 +56,7 @@ static void node_composit_init_chroma_matte(bNodeTree *UNUSED(ntree), bNode *nod
 	c->fstrength= 1.0f;
 }
 
-void register_node_type_cmp_chroma_matte()
+void register_node_type_cmp_chroma_matte(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_colorMatte.c b/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
index c1ed315adcb..2ecb5e3fb7c 100644
--- a/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
@@ -56,7 +56,7 @@ static void node_composit_init_color_matte(bNodeTree *UNUSED(ntree), bNode *node
 	c->fstrength= 1.0f;
 }
 
-void register_node_type_cmp_color_matte()
+void register_node_type_cmp_color_matte(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_colorSpill.c b/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
index 848a5280992..60cfd7c90f3 100644
--- a/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
+++ b/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
@@ -54,7 +54,7 @@ static void node_composit_init_color_spill(bNodeTree *UNUSED(ntree), bNode *node
 	ncs->unspill=0;   /* do not use unspill */
 }
 
-void register_node_type_cmp_color_spill()
+void register_node_type_cmp_color_spill(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/composite/nodes/node_composite_colorbalance.c b/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
index ebd41441b31..693680f58a8 100644
--- a/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
+++ b/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
@@ -55,7 +55,7 @@ static void node_composit_init_colorbalance(bNodeTree *UNUSED(ntree), bNode *nod
 	n->gain[0] = n->gain[1] = n->gain[2] = 1.0f;
 }
 
-void register_node_type_cmp_colorbalance()
+void register_node_type_cmp_colorbalance(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_common.c b/source/blender/nodes/composite/nodes/node_composite_common.c
index 384653e7b41..44643724073 100644
--- a/source/blender/nodes/composite/nodes/node_composite_common.c
+++ b/source/blender/nodes/composite/nodes/node_composite_common.c
@@ -41,7 +41,7 @@
 
 #include "RNA_access.h"
 
-void register_node_type_cmp_group()
+void register_node_type_cmp_group(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/composite/nodes/node_composite_composite.c b/source/blender/nodes/composite/nodes/node_composite_composite.c
index 42e284e0c52..7fa7a5048ab 100644
--- a/source/blender/nodes/composite/nodes/node_composite_composite.c
+++ b/source/blender/nodes/composite/nodes/node_composite_composite.c
@@ -39,7 +39,7 @@ static bNodeSocketTemplate cmp_node_composite_in[] = {
 	{	-1, 0, ""	}
 };
 
-void register_node_type_cmp_composite()
+void register_node_type_cmp_composite(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_crop.c b/source/blender/nodes/composite/nodes/node_composite_crop.c
index bae36024b88..677dafeb527 100644
--- a/source/blender/nodes/composite/nodes/node_composite_crop.c
+++ b/source/blender/nodes/composite/nodes/node_composite_crop.c
@@ -53,7 +53,7 @@ static void node_composit_init_crop(bNodeTree *UNUSED(ntree), bNode *node)
 	nxy->y2= 0;
 }
 
-void register_node_type_cmp_crop()
+void register_node_type_cmp_crop(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_curves.c b/source/blender/nodes/composite/nodes/node_composite_curves.c
index 18999cdc985..2bf901491bf 100644
--- a/source/blender/nodes/composite/nodes/node_composite_curves.c
+++ b/source/blender/nodes/composite/nodes/node_composite_curves.c
@@ -48,7 +48,7 @@ static void node_composit_init_curves_time(bNodeTree *UNUSED(ntree), bNode *node
 	node->storage= curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
 }
 
-void register_node_type_cmp_curve_time()
+void register_node_type_cmp_curve_time(void)
 {
 	static bNodeType ntype;
 
@@ -79,7 +79,7 @@ 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);
 }
 
-void register_node_type_cmp_curve_vec()
+void register_node_type_cmp_curve_vec(void)
 {
 	static bNodeType ntype;
 
@@ -112,7 +112,7 @@ 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);
 }
 
-void register_node_type_cmp_curve_rgb()
+void register_node_type_cmp_curve_rgb(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_defocus.c b/source/blender/nodes/composite/nodes/node_composite_defocus.c
index 95d9e611584..9581ef981cb 100644
--- a/source/blender/nodes/composite/nodes/node_composite_defocus.c
+++ b/source/blender/nodes/composite/nodes/node_composite_defocus.c
@@ -61,7 +61,7 @@ static void node_composit_init_defocus(bNodeTree *UNUSED(ntree), bNode *node)
 	node->storage = nbd;
 }
 
-void register_node_type_cmp_defocus()
+void register_node_type_cmp_defocus(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_despeckle.c b/source/blender/nodes/composite/nodes/node_composite_despeckle.c
index 9811e2762df..486c69caba0 100644
--- a/source/blender/nodes/composite/nodes/node_composite_despeckle.c
+++ b/source/blender/nodes/composite/nodes/node_composite_despeckle.c
@@ -48,7 +48,7 @@ static void node_composit_init_despeckle(bNodeTree *UNUSED(ntree), bNode *node)
 	node->custom4 = 0.5f;
 }
 
-void register_node_type_cmp_despeckle()
+void register_node_type_cmp_despeckle(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_diffMatte.c b/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
index 1faf1d1e82c..99170c294de 100644
--- a/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
@@ -53,7 +53,7 @@ static void node_composit_init_diff_matte(bNodeTree *UNUSED(ntree), bNode *node)
 	c->t2= 0.1f;
 }
 
-void register_node_type_cmp_diff_matte()
+void register_node_type_cmp_diff_matte(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_dilate.c b/source/blender/nodes/composite/nodes/node_composite_dilate.c
index d68a8c340d7..d9caff0d495 100644
--- a/source/blender/nodes/composite/nodes/node_composite_dilate.c
+++ b/source/blender/nodes/composite/nodes/node_composite_dilate.c
@@ -51,7 +51,7 @@ static void node_composit_init_dilateerode(bNodeTree *UNUSED(ntree), bNode *node
 	node->storage = data;
 }
 
-void register_node_type_cmp_dilateerode()
+void register_node_type_cmp_dilateerode(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/composite/nodes/node_composite_directionalblur.c b/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
index 3a9c4928175..7edef3bf319 100644
--- a/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
+++ b/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
@@ -50,7 +50,7 @@ static void node_composit_init_dblur(bNodeTree *UNUSED(ntree), bNode *node)
 	ndbd->center_y = 0.5;
 }
 
-void register_node_type_cmp_dblur()
+void register_node_type_cmp_dblur(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_displace.c b/source/blender/nodes/composite/nodes/node_composite_displace.c
index 2ae7423b31b..33f82355629 100644
--- a/source/blender/nodes/composite/nodes/node_composite_displace.c
+++ b/source/blender/nodes/composite/nodes/node_composite_displace.c
@@ -47,7 +47,7 @@ static bNodeSocketTemplate cmp_node_displace_out[] = {
 	{	-1, 0, ""	}
 };
 
-void register_node_type_cmp_displace()
+void register_node_type_cmp_displace(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c b/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
index 1bbe71810c3..b75301676e6 100644
--- a/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
@@ -54,7 +54,7 @@ static void node_composit_init_distance_matte(bNodeTree *UNUSED(ntree), bNode *n
 	c->t2= 0.1f;
 }
 
-void register_node_type_cmp_distance_matte()
+void register_node_type_cmp_distance_matte(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c b/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
index 767dfce4d59..0659a353afb 100644
--- a/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
+++ b/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
@@ -42,7 +42,7 @@ static bNodeSocketTemplate cmp_node_doubleedgemask_out[] = {
 	{ -1, 0, "" }					// output socket array terminator
 };
 
-void register_node_type_cmp_doubleedgemask()
+void register_node_type_cmp_doubleedgemask(void)
 {
 	static bNodeType ntype;	// allocate a node type data structure
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_filter.c b/source/blender/nodes/composite/nodes/node_composite_filter.c
index cdd3e136874..408c2ff8d73 100644
--- a/source/blender/nodes/composite/nodes/node_composite_filter.c
+++ b/source/blender/nodes/composite/nodes/node_composite_filter.c
@@ -43,7 +43,7 @@ static bNodeSocketTemplate cmp_node_filter_out[] = {
 	{	-1, 0, ""	}
 };
 
-void register_node_type_cmp_filter()
+void register_node_type_cmp_filter(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_flip.c b/source/blender/nodes/composite/nodes/node_composite_flip.c
index 0041cdfd44e..f05447d79c2 100644
--- a/source/blender/nodes/composite/nodes/node_composite_flip.c
+++ b/source/blender/nodes/composite/nodes/node_composite_flip.c
@@ -43,7 +43,7 @@ static bNodeSocketTemplate cmp_node_flip_out[] = {
 	{	-1, 0, ""	}
 };
 
-void register_node_type_cmp_flip()
+void register_node_type_cmp_flip(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_gamma.c b/source/blender/nodes/composite/nodes/node_composite_gamma.c
index 43eaa26c863..27bf72d53b4 100644
--- a/source/blender/nodes/composite/nodes/node_composite_gamma.c
+++ b/source/blender/nodes/composite/nodes/node_composite_gamma.c
@@ -45,7 +45,7 @@ static bNodeSocketTemplate cmp_node_gamma_out[] = {
 	{	-1, 0, ""	}
 };
 
-void register_node_type_cmp_gamma()
+void register_node_type_cmp_gamma(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/composite/nodes/node_composite_glare.c b/source/blender/nodes/composite/nodes/node_composite_glare.c
index c2f889a7bf5..19f5ab10a15 100644
--- a/source/blender/nodes/composite/nodes/node_composite_glare.c
+++ b/source/blender/nodes/composite/nodes/node_composite_glare.c
@@ -57,7 +57,7 @@ static void node_composit_init_glare(bNodeTree *UNUSED(ntree), bNode *node)
 	node->storage = ndg;
 }
 
-void register_node_type_cmp_glare()
+void register_node_type_cmp_glare(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c b/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
index 06ba1ba4851..01c6f639cbb 100644
--- a/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
+++ b/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
@@ -53,7 +53,7 @@ static void node_composit_init_hue_sat(bNodeTree *UNUSED(ntree), bNode *node)
 	nhs->val= 1.0f;
 }
 
-void register_node_type_cmp_hue_sat()
+void register_node_type_cmp_hue_sat(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_huecorrect.c b/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
index 3ec4a9c9a4a..71e4df04911 100644
--- a/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
+++ b/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
@@ -59,7 +59,7 @@ static void node_composit_init_huecorrect(bNodeTree *UNUSED(ntree), bNode *node)
 	cumapping->cur = 1;
 }
 
-void register_node_type_cmp_huecorrect()
+void register_node_type_cmp_huecorrect(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_idMask.c b/source/blender/nodes/composite/nodes/node_composite_idMask.c
index 2d4fcc76462..529bc83946b 100644
--- a/source/blender/nodes/composite/nodes/node_composite_idMask.c
+++ b/source/blender/nodes/composite/nodes/node_composite_idMask.c
@@ -44,7 +44,7 @@ static bNodeSocketTemplate cmp_node_idmask_out[] = {
 	{	-1, 0, ""	}
 };
 
-void register_node_type_cmp_idmask()
+void register_node_type_cmp_idmask(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_image.c b/source/blender/nodes/composite/nodes/node_composite_image.c
index f9f289297d7..aa218252472 100644
--- a/source/blender/nodes/composite/nodes/node_composite_image.c
+++ b/source/blender/nodes/composite/nodes/node_composite_image.c
@@ -202,8 +202,8 @@ static bNodeSocket *cmp_node_image_output_find_match(bNode *UNUSED(node), bNodeS
 {
 	bNodeSocket *sock;
 	
-	for (sock=oldsocklist->first; sock; sock=sock->next)
-		if (strcmp(sock->name, newsock->name)==0)
+	for (sock=oldsocklist->first; sock; sock = sock->next)
+		if (STREQ(sock->name, newsock->name))
 			return sock;
 	return NULL;
 }
@@ -213,8 +213,8 @@ static bNodeSocket *cmp_node_image_output_relink(bNode *node, bNodeSocket *oldso
 	bNodeSocket *sock;
 	
 	/* first try to find matching socket name */
-	for (sock=node->outputs.first; sock; sock=sock->next)
-		if (strcmp(sock->name, oldsock->name)==0)
+	for (sock = node->outputs.first; sock; sock = sock->next)
+		if (STREQ(sock->name, oldsock->name))
 			return sock;
 	
 	/* no matching name, simply link to same index */
@@ -241,7 +241,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) {
@@ -299,7 +299,7 @@ static void node_composit_free_image(bNode *node)
 	bNodeSocket *sock;
 	
 	/* free extra socket info */
-	for (sock=node->outputs.first; sock; sock=sock->next)
+	for (sock = node->outputs.first; sock; sock = sock->next)
 		MEM_freeN(sock->storage);
 	
 	MEM_freeN(node->storage);
@@ -312,11 +312,11 @@ static void node_composit_copy_image(bNodeTree *UNUSED(dest_ntree), bNode *dest_
 	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);
 }
 
-void register_node_type_cmp_image()
+void register_node_type_cmp_image(void)
 {
 	static bNodeType ntype;
 
@@ -340,7 +340,7 @@ static int node_composit_poll_rlayers(bNodeType *UNUSED(ntype), bNodeTree *ntree
 	return (strcmp(ntree->idname, "CompositorNodeTree")==0 && RNA_boolean_get(&ptr, "is_local_tree"));
 }
 
-void register_node_type_cmp_rlayers()
+void register_node_type_cmp_rlayers(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_invert.c b/source/blender/nodes/composite/nodes/node_composite_invert.c
index 9765c3c8764..6a3da2c854b 100644
--- a/source/blender/nodes/composite/nodes/node_composite_invert.c
+++ b/source/blender/nodes/composite/nodes/node_composite_invert.c
@@ -49,7 +49,7 @@ static void node_composit_init_invert(bNodeTree *UNUSED(ntree), bNode *node)
 }
 
 /* custom1 = mix type */
-void register_node_type_cmp_invert()
+void register_node_type_cmp_invert(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_lensdist.c b/source/blender/nodes/composite/nodes/node_composite_lensdist.c
index 78eeccbe4b1..c093d563363 100644
--- a/source/blender/nodes/composite/nodes/node_composite_lensdist.c
+++ b/source/blender/nodes/composite/nodes/node_composite_lensdist.c
@@ -51,7 +51,7 @@ static void node_composit_init_lensdist(bNodeTree *UNUSED(ntree), bNode *node)
 }
 
 
-void register_node_type_cmp_lensdist()
+void register_node_type_cmp_lensdist(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_levels.c b/source/blender/nodes/composite/nodes/node_composite_levels.c
index 2d24dfadbd3..e2b3895a96f 100644
--- a/source/blender/nodes/composite/nodes/node_composite_levels.c
+++ b/source/blender/nodes/composite/nodes/node_composite_levels.c
@@ -50,7 +50,7 @@ static void node_composit_init_view_levels(bNodeTree *UNUSED(ntree), bNode *node
 	node->custom1=1; /*All channels*/
 }
 
-void register_node_type_cmp_view_levels()
+void register_node_type_cmp_view_levels(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c b/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
index 2155db9ae20..606c95b495d 100644
--- a/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
@@ -53,7 +53,7 @@ static void node_composit_init_luma_matte(bNodeTree *UNUSED(ntree), bNode *node)
 	c->t2= 0.0f;
 }
 
-void register_node_type_cmp_luma_matte()
+void register_node_type_cmp_luma_matte(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_mapRange.c b/source/blender/nodes/composite/nodes/node_composite_mapRange.c
index 43d359db0a5..74c36a3e25a 100644
--- a/source/blender/nodes/composite/nodes/node_composite_mapRange.c
+++ b/source/blender/nodes/composite/nodes/node_composite_mapRange.c
@@ -46,7 +46,7 @@ static bNodeSocketTemplate cmp_node_map_range_out[] = {
 	{	-1, 0, ""	}
 };
 
-void register_node_type_cmp_map_range()
+void register_node_type_cmp_map_range(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_mapUV.c b/source/blender/nodes/composite/nodes/node_composite_mapUV.c
index eca8dea0470..0d2c53f241c 100644
--- a/source/blender/nodes/composite/nodes/node_composite_mapUV.c
+++ b/source/blender/nodes/composite/nodes/node_composite_mapUV.c
@@ -44,7 +44,7 @@ static bNodeSocketTemplate cmp_node_mapuv_out[] = {
 	{	-1, 0, ""	}
 };
 
-void register_node_type_cmp_mapuv()
+void register_node_type_cmp_mapuv(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_mapValue.c b/source/blender/nodes/composite/nodes/node_composite_mapValue.c
index e12c7e2d2c7..a61ecd41746 100644
--- a/source/blender/nodes/composite/nodes/node_composite_mapValue.c
+++ b/source/blender/nodes/composite/nodes/node_composite_mapValue.c
@@ -47,7 +47,7 @@ static void node_composit_init_map_value(bNodeTree *UNUSED(ntree), bNode *node)
 	node->storage= add_tex_mapping();
 }
 
-void register_node_type_cmp_map_value()
+void register_node_type_cmp_map_value(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_math.c b/source/blender/nodes/composite/nodes/node_composite_math.c
index 90c0d6ce30a..802a370f882 100644
--- a/source/blender/nodes/composite/nodes/node_composite_math.c
+++ b/source/blender/nodes/composite/nodes/node_composite_math.c
@@ -45,7 +45,7 @@ static bNodeSocketTemplate cmp_node_math_out[] = {
 };
 
 
-void register_node_type_cmp_math()
+void register_node_type_cmp_math(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_mixrgb.c b/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
index 0a6559d4f2f..a3415761bf8 100644
--- a/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
+++ b/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
@@ -44,7 +44,7 @@ static bNodeSocketTemplate cmp_node_mix_rgb_out[] = {
 };
 
 /* custom1 = mix type */
-void register_node_type_cmp_mix_rgb()
+void register_node_type_cmp_mix_rgb(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_movieclip.c b/source/blender/nodes/composite/nodes/node_composite_movieclip.c
index ae6f02452b4..34d7eeb570d 100644
--- a/source/blender/nodes/composite/nodes/node_composite_movieclip.c
+++ b/source/blender/nodes/composite/nodes/node_composite_movieclip.c
@@ -50,7 +50,7 @@ static void init(bNodeTree *UNUSED(ntree), bNode *node)
 	user->framenr = 1;
 }
 
-void register_node_type_cmp_movieclip()
+void register_node_type_cmp_movieclip(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c b/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
index b8770d1670e..86666a38f1d 100644
--- a/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
+++ b/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
@@ -66,7 +66,7 @@ static void storage_copy(bNodeTree *UNUSED(dest_ntree), bNode *dest_node, bNode
 		dest_node->storage = BKE_tracking_distortion_copy(src_node->storage);
 }
 
-void register_node_type_cmp_moviedistortion()
+void register_node_type_cmp_moviedistortion(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_normal.c b/source/blender/nodes/composite/nodes/node_composite_normal.c
index 7a6d2fcd8e8..0f7fdb53693 100644
--- a/source/blender/nodes/composite/nodes/node_composite_normal.c
+++ b/source/blender/nodes/composite/nodes/node_composite_normal.c
@@ -44,7 +44,7 @@ static bNodeSocketTemplate cmp_node_normal_out[] = {
 	{	-1, 0, ""	}
 };
 
-void register_node_type_cmp_normal()
+void register_node_type_cmp_normal(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_normalize.c b/source/blender/nodes/composite/nodes/node_composite_normalize.c
index 2f19c6bc523..c101d7edec4 100644
--- a/source/blender/nodes/composite/nodes/node_composite_normalize.c
+++ b/source/blender/nodes/composite/nodes/node_composite_normalize.c
@@ -43,7 +43,7 @@ static bNodeSocketTemplate cmp_node_normalize_out[] = {
 	{   -1, 0, ""   }
 };
 
-void register_node_type_cmp_normalize()
+void register_node_type_cmp_normalize(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/composite/nodes/node_composite_outputFile.c b/source/blender/nodes/composite/nodes/node_composite_outputFile.c
index e008e17cbb0..18bb97c70ed 100644
--- a/source/blender/nodes/composite/nodes/node_composite_outputFile.c
+++ b/source/blender/nodes/composite/nodes/node_composite_outputFile.c
@@ -53,10 +53,10 @@ static bool unique_path_unique_check(void *arg, const char *name)
 {
 	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 (strcmp(sockdata->path, name)==0)
+			if (STREQ(sockdata->path, name))
 				return true;
 		}
 	}
@@ -82,10 +82,10 @@ static bool unique_layer_unique_check(void *arg, const char *name)
 {
 	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 (strcmp(sockdata->layer, name)==0)
+			if (STREQ(sockdata->layer, name))
 				return true;
 		}
 	}
@@ -202,7 +202,7 @@ static void free_output_file(bNode *node)
 	bNodeSocket *sock;
 	
 	/* free storage data in sockets */
-	for (sock=node->inputs.first; sock; sock=sock->next) {
+	for (sock = node->inputs.first; sock; sock = sock->next) {
 		MEM_freeN(sock->storage);
 	}
 	
@@ -229,7 +229,7 @@ static void update_output_file(bNodeTree *ntree, bNode *node)
 	cmp_node_update_default(ntree, node);
 	
 	/* automatically update the socket type based on linked input */
-	for (sock=node->inputs.first; sock; sock=sock->next) {
+	for (sock = node->inputs.first; sock; sock = sock->next) {
 		if (sock->link) {
 			RNA_pointer_create((ID *)ntree, &RNA_NodeSocket, sock, &ptr);
 			RNA_enum_set(&ptr, "type", sock->link->fromsock->type);
@@ -237,7 +237,7 @@ static void update_output_file(bNodeTree *ntree, bNode *node)
 	}
 }
 
-void register_node_type_cmp_output_file()
+void register_node_type_cmp_output_file(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_pixelate.c b/source/blender/nodes/composite/nodes/node_composite_pixelate.c
index bb8df65ee23..d12c09cb25e 100644
--- a/source/blender/nodes/composite/nodes/node_composite_pixelate.c
+++ b/source/blender/nodes/composite/nodes/node_composite_pixelate.c
@@ -45,7 +45,7 @@ static bNodeSocketTemplate cmp_node_pixelate_out[] = {
 	{   -1, 0, ""   }
 };
 
-void register_node_type_cmp_pixelate()
+void register_node_type_cmp_pixelate(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_premulkey.c b/source/blender/nodes/composite/nodes/node_composite_premulkey.c
index 75e34335c3a..bfc5a54cf73 100644
--- a/source/blender/nodes/composite/nodes/node_composite_premulkey.c
+++ b/source/blender/nodes/composite/nodes/node_composite_premulkey.c
@@ -44,7 +44,7 @@ static bNodeSocketTemplate cmp_node_premulkey_out[] = {
 	{	-1, 0, ""	}
 };
 
-void register_node_type_cmp_premulkey()
+void register_node_type_cmp_premulkey(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_rgb.c b/source/blender/nodes/composite/nodes/node_composite_rgb.c
index d2ebd84487d..e3209844319 100644
--- a/source/blender/nodes/composite/nodes/node_composite_rgb.c
+++ b/source/blender/nodes/composite/nodes/node_composite_rgb.c
@@ -38,7 +38,7 @@ static bNodeSocketTemplate cmp_node_rgb_out[] = {
 	{	-1, 0, ""	}
 };
 
-void register_node_type_cmp_rgb()
+void register_node_type_cmp_rgb(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_rotate.c b/source/blender/nodes/composite/nodes/node_composite_rotate.c
index f52d54b9c64..1f51e25798d 100644
--- a/source/blender/nodes/composite/nodes/node_composite_rotate.c
+++ b/source/blender/nodes/composite/nodes/node_composite_rotate.c
@@ -49,7 +49,7 @@ static void node_composit_init_rotate(bNodeTree *UNUSED(ntree), bNode *node)
 	node->custom1= 1; /* Bilinear Filter*/
 }
 
-void register_node_type_cmp_rotate()
+void register_node_type_cmp_rotate(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_scale.c b/source/blender/nodes/composite/nodes/node_composite_scale.c
index 284b6dca72d..0d8763bf321 100644
--- a/source/blender/nodes/composite/nodes/node_composite_scale.c
+++ b/source/blender/nodes/composite/nodes/node_composite_scale.c
@@ -45,7 +45,7 @@ static bNodeSocketTemplate cmp_node_scale_out[] = {
 	{   -1, 0, ""   }
 };
 
-void register_node_type_cmp_scale()
+void register_node_type_cmp_scale(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c b/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
index 2043812c6eb..9aa64138cd6 100644
--- a/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
+++ b/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
@@ -46,7 +46,7 @@ static bNodeSocketTemplate cmp_node_sephsva_out[] = {
 	{	-1, 0, ""	}
 };
 
-void register_node_type_cmp_sephsva()
+void register_node_type_cmp_sephsva(void)
 {
 	static bNodeType ntype;
 
@@ -70,7 +70,7 @@ static bNodeSocketTemplate cmp_node_combhsva_out[] = {
 	{	-1, 0, ""	}
 };
 
-void register_node_type_cmp_combhsva()
+void register_node_type_cmp_combhsva(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c b/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
index 6b522184fe7..603cc01c259 100644
--- a/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
+++ b/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
@@ -45,7 +45,7 @@ static bNodeSocketTemplate cmp_node_seprgba_out[] = {
 	{	-1, 0, ""	}
 };
 
-void register_node_type_cmp_seprgba()
+void register_node_type_cmp_seprgba(void)
 {
 	static bNodeType ntype;
 
@@ -70,7 +70,7 @@ static bNodeSocketTemplate cmp_node_combrgba_out[] = {
 	{	-1, 0, ""	}
 };
 
-void register_node_type_cmp_combrgba()
+void register_node_type_cmp_combrgba(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c b/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
index 5940cf18c8a..cae70efc85d 100644
--- a/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
+++ b/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
@@ -47,7 +47,7 @@ static bNodeSocketTemplate cmp_node_sepycca_out[] = {
 };
 
 
-void register_node_type_cmp_sepycca()
+void register_node_type_cmp_sepycca(void)
 {
 	static bNodeType ntype;
 
@@ -72,7 +72,7 @@ static bNodeSocketTemplate cmp_node_combycca_out[] = {
 	{	-1, 0, ""	}
 };
 
-void register_node_type_cmp_combycca()
+void register_node_type_cmp_combycca(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c b/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
index 01dfd3b1abd..74c840adef1 100644
--- a/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
+++ b/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
@@ -46,7 +46,7 @@ static bNodeSocketTemplate cmp_node_sepyuva_out[] = {
 	{  -1, 0, ""   }
 };
 
-void register_node_type_cmp_sepyuva()
+void register_node_type_cmp_sepyuva(void)
 {
 	static bNodeType ntype;
 
@@ -71,7 +71,7 @@ static bNodeSocketTemplate cmp_node_combyuva_out[] = {
 	{	-1, 0, ""	}
 };
 
-void register_node_type_cmp_combyuva()
+void register_node_type_cmp_combyuva(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_setalpha.c b/source/blender/nodes/composite/nodes/node_composite_setalpha.c
index 30e408dcccb..a162936c9a2 100644
--- a/source/blender/nodes/composite/nodes/node_composite_setalpha.c
+++ b/source/blender/nodes/composite/nodes/node_composite_setalpha.c
@@ -43,7 +43,7 @@ static bNodeSocketTemplate cmp_node_setalpha_out[] = {
 	{	-1, 0, ""	}
 };
 
-void register_node_type_cmp_setalpha()
+void register_node_type_cmp_setalpha(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_splitViewer.c b/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
index 9fd61eca668..7cb1cf1d65d 100644
--- a/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
+++ b/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
@@ -49,7 +49,7 @@ static void node_composit_init_splitviewer(bNodeTree *UNUSED(ntree), bNode *node
 	node->custom1= 50;	/* default 50% split */
 }
 
-void register_node_type_cmp_splitviewer()
+void register_node_type_cmp_splitviewer(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c b/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
index 2aa2906d67a..3b85b4a6b8c 100644
--- a/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
+++ b/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
@@ -45,7 +45,7 @@ static bNodeSocketTemplate cmp_node_stabilize2d_out[] = {
 	{	-1, 0, ""	}
 };
 
-void register_node_type_cmp_stabilize2d()
+void register_node_type_cmp_stabilize2d(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_texture.c b/source/blender/nodes/composite/nodes/node_composite_texture.c
index 3793dd4669a..320b8f6aabe 100644
--- a/source/blender/nodes/composite/nodes/node_composite_texture.c
+++ b/source/blender/nodes/composite/nodes/node_composite_texture.c
@@ -44,7 +44,7 @@ static bNodeSocketTemplate cmp_node_texture_out[] = {
 	{	-1, 0, ""	}
 };
 
-void register_node_type_cmp_texture()
+void register_node_type_cmp_texture(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_tonemap.c b/source/blender/nodes/composite/nodes/node_composite_tonemap.c
index 4f43297a182..6f6fbc21a40 100644
--- a/source/blender/nodes/composite/nodes/node_composite_tonemap.c
+++ b/source/blender/nodes/composite/nodes/node_composite_tonemap.c
@@ -57,7 +57,7 @@ static void node_composit_init_tonemap(bNodeTree *UNUSED(ntree), bNode *node)
 	node->storage = ntm;
 }
 
-void register_node_type_cmp_tonemap()
+void register_node_type_cmp_tonemap(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_transform.c b/source/blender/nodes/composite/nodes/node_composite_transform.c
index 9618cc85811..8dc272adf38 100644
--- a/source/blender/nodes/composite/nodes/node_composite_transform.c
+++ b/source/blender/nodes/composite/nodes/node_composite_transform.c
@@ -48,7 +48,7 @@ static bNodeSocketTemplate cmp_node_transform_out[] = {
 	{	-1, 0, ""	}
 };
 
-void register_node_type_cmp_transform()
+void register_node_type_cmp_transform(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_translate.c b/source/blender/nodes/composite/nodes/node_composite_translate.c
index 2449f614fe0..ae293170004 100644
--- a/source/blender/nodes/composite/nodes/node_composite_translate.c
+++ b/source/blender/nodes/composite/nodes/node_composite_translate.c
@@ -52,7 +52,7 @@ static void node_composit_init_translate(bNodeTree *UNUSED(ntree), bNode *node)
 	node->storage = data;
 }
 
-void register_node_type_cmp_translate()
+void register_node_type_cmp_translate(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_valToRgb.c b/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
index db02c51c95f..a1d51bdf171 100644
--- a/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
+++ b/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
@@ -46,10 +46,10 @@ static bNodeSocketTemplate cmp_node_valtorgb_out[] = {
 
 static void node_composit_init_valtorgb(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	node->storage= add_colorband(1);
+	node->storage= add_colorband(true);
 }
 
-void register_node_type_cmp_valtorgb()
+void register_node_type_cmp_valtorgb(void)
 {
 	static bNodeType ntype;
 
@@ -74,7 +74,7 @@ static bNodeSocketTemplate cmp_node_rgbtobw_out[] = {
 	{	-1, 0, ""	}
 };
 
-void register_node_type_cmp_rgbtobw()
+void register_node_type_cmp_rgbtobw(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/composite/nodes/node_composite_value.c b/source/blender/nodes/composite/nodes/node_composite_value.c
index 491c01c465a..87c77440985 100644
--- a/source/blender/nodes/composite/nodes/node_composite_value.c
+++ b/source/blender/nodes/composite/nodes/node_composite_value.c
@@ -38,7 +38,7 @@ static bNodeSocketTemplate cmp_node_value_out[] = {
 	{	-1, 0, ""	}
 };
 
-void register_node_type_cmp_value()
+void register_node_type_cmp_value(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_vecBlur.c b/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
index 02a5fdcc0e5..b00cfc315b0 100644
--- a/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
+++ b/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
@@ -54,7 +54,7 @@ static void node_composit_init_vecblur(bNodeTree *UNUSED(ntree), bNode *node)
 }
 
 /* custom1: itterations, custom2: maxspeed (0 = nolimit) */
-void register_node_type_cmp_vecblur()
+void register_node_type_cmp_vecblur(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_viewer.c b/source/blender/nodes/composite/nodes/node_composite_viewer.c
index a1e6640dcb6..70aae460af7 100644
--- a/source/blender/nodes/composite/nodes/node_composite_viewer.c
+++ b/source/blender/nodes/composite/nodes/node_composite_viewer.c
@@ -52,7 +52,7 @@ static void node_composit_init_viewer(bNodeTree *UNUSED(ntree), bNode *node)
 	node->custom4 = 0.5f;
 }
 
-void register_node_type_cmp_viewer()
+void register_node_type_cmp_viewer(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/composite/nodes/node_composite_zcombine.c b/source/blender/nodes/composite/nodes/node_composite_zcombine.c
index ca7258c5b97..6e5f38e1fab 100644
--- a/source/blender/nodes/composite/nodes/node_composite_zcombine.c
+++ b/source/blender/nodes/composite/nodes/node_composite_zcombine.c
@@ -48,7 +48,7 @@ static bNodeSocketTemplate cmp_node_zcombine_out[] = {
 	{	-1, 0, ""	}
 };
 
-void register_node_type_cmp_zcombine()
+void register_node_type_cmp_zcombine(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/intern/node_common.c b/source/blender/nodes/intern/node_common.c
index 85e2f775ad9..92789eef816 100644
--- a/source/blender/nodes/intern/node_common.c
+++ b/source/blender/nodes/intern/node_common.c
@@ -66,8 +66,8 @@
 bNodeSocket *node_group_find_input_socket(bNode *groupnode, const char *identifier)
 {
 	bNodeSocket *sock;
-	for (sock=groupnode->inputs.first; sock; sock=sock->next)
-		if (strcmp(sock->identifier, identifier)==0)
+	for (sock=groupnode->inputs.first; sock; sock = sock->next)
+		if (STREQ(sock->identifier, identifier))
 			return sock;
 	return NULL;
 }
@@ -75,8 +75,8 @@ bNodeSocket *node_group_find_input_socket(bNode *groupnode, const char *identifi
 bNodeSocket *node_group_find_output_socket(bNode *groupnode, const char *identifier)
 {
 	bNodeSocket *sock;
-	for (sock=groupnode->outputs.first; sock; sock=sock->next)
-		if (strcmp(sock->identifier, identifier)==0)
+	for (sock=groupnode->outputs.first; sock; sock = sock->next)
+		if (STREQ(sock->identifier, identifier))
 			return sock;
 	return NULL;
 }
@@ -119,8 +119,8 @@ static bNodeSocket *group_verify_socket(bNodeTree *ntree, bNode *gnode, bNodeSoc
 	bNodeSocket *sock;
 	
 	for (sock= verify_lb->first; sock; sock= sock->next) {
-		if (strcmp(sock->identifier, iosock->identifier)==0)
-				break;
+		if (STREQ(sock->identifier, iosock->identifier))
+			break;
 	}
 	if (sock) {
 		strcpy(sock->name, iosock->name);
@@ -334,8 +334,8 @@ static void node_group_input_init(bNodeTree *ntree, bNode *node)
 bNodeSocket *node_group_input_find_socket(bNode *node, const char *identifier)
 {
 	bNodeSocket *sock;
-	for (sock=node->outputs.first; sock; sock=sock->next)
-		if (strcmp(sock->identifier, identifier)==0)
+	for (sock = node->outputs.first; sock; sock = sock->next)
+		if (STREQ(sock->identifier, identifier))
 			return sock;
 	return NULL;
 }
@@ -421,8 +421,8 @@ static void node_group_output_init(bNodeTree *ntree, bNode *node)
 bNodeSocket *node_group_output_find_socket(bNode *node, const char *identifier)
 {
 	bNodeSocket *sock;
-	for (sock=node->inputs.first; sock; sock=sock->next)
-		if (strcmp(sock->identifier, identifier)==0)
+	for (sock = node->inputs.first; sock; sock = sock->next)
+		if (STREQ(sock->identifier, identifier))
 			return sock;
 	return NULL;
 }
diff --git a/source/blender/nodes/intern/node_exec.c b/source/blender/nodes/intern/node_exec.c
index 8fb23064bf0..f6bf1db5254 100644
--- a/source/blender/nodes/intern/node_exec.c
+++ b/source/blender/nodes/intern/node_exec.c
@@ -177,15 +177,15 @@ bNodeTreeExec *ntree_exec_begin(bNodeExecContext *context, bNodeTree *ntree, bNo
 		node->stack_index = index;
 		
 		/* init node socket stack indexes */
-		for (sock=node->inputs.first; sock; sock=sock->next)
+		for (sock = node->inputs.first; sock; sock = sock->next)
 			node_init_input_index(sock, &index);
 		
 		if (node->flag & NODE_MUTED || node->type == NODE_REROUTE) {
-			for (sock=node->outputs.first; sock; sock=sock->next)
+			for (sock = node->outputs.first; sock; sock = sock->next)
 				node_init_output_index(sock, &index, &node->internal_links);
 		}
 		else {
-			for (sock=node->outputs.first; sock; sock=sock->next)
+			for (sock = node->outputs.first; sock; sock = sock->next)
 				node_init_output_index(sock, &index, NULL);
 		}
 	}
@@ -206,7 +206,7 @@ bNodeTreeExec *ntree_exec_begin(bNodeExecContext *context, bNodeTree *ntree, bNo
 		node = nodeexec->node = nodelist[n];
 		
 		/* tag inputs */
-		for (sock=node->inputs.first; sock; sock=sock->next) {
+		for (sock = node->inputs.first; sock; sock = sock->next) {
 			/* disable the node if an input link is invalid */
 			if (sock->link && !(sock->link->flag & NODE_LINK_VALID))
 				node->need_exec= 0;
@@ -217,7 +217,7 @@ bNodeTreeExec *ntree_exec_begin(bNodeExecContext *context, bNodeTree *ntree, bNo
 		}
 		
 		/* tag all outputs */
-		for (sock=node->outputs.first; sock; sock=sock->next) {
+		for (sock = node->outputs.first; sock; sock = sock->next) {
 			/* ns = */ setup_stack(exec->stack, ntree, node, sock);
 		}
 		
diff --git a/source/blender/nodes/intern/node_socket.c b/source/blender/nodes/intern/node_socket.c
index a67fa4a0fd5..86a8331e5dd 100644
--- a/source/blender/nodes/intern/node_socket.c
+++ b/source/blender/nodes/intern/node_socket.c
@@ -328,7 +328,7 @@ static bNodeSocketType *make_socket_type_virtual(void)
 }
 
 
-void register_standard_node_socket_types()
+void register_standard_node_socket_types(void)
 {
 	/* draw callbacks are set in drawnode.c to avoid bad-level calls */
 	
diff --git a/source/blender/nodes/shader/node_shader_tree.c b/source/blender/nodes/shader/node_shader_tree.c
index 30da509c09d..68846255983 100644
--- a/source/blender/nodes/shader/node_shader_tree.c
+++ b/source/blender/nodes/shader/node_shader_tree.c
@@ -156,7 +156,7 @@ static void update(bNodeTree *ntree)
 
 bNodeTreeType *ntreeType_Shader;
 
-void register_node_tree_type_sh()
+void register_node_tree_type_sh(void)
 {
 	bNodeTreeType *tt = ntreeType_Shader = MEM_callocN(sizeof(bNodeTreeType), "shader node tree type");
 	
diff --git a/source/blender/nodes/shader/node_shader_util.c b/source/blender/nodes/shader/node_shader_util.c
index 040172d9998..c8c4b49edb7 100644
--- a/source/blender/nodes/shader/node_shader_util.c
+++ b/source/blender/nodes/shader/node_shader_util.c
@@ -98,7 +98,7 @@ void ntreeShaderGetTexcoMode(bNodeTree *ntree, int r_mode, short *texco, int *mo
 	bNodeSocket *sock;
 	int a;
 	
-	for (node= ntree->nodes.first; node; node= node->next) {
+	for (node = ntree->nodes.first; node; node = node->next) {
 		if (node->type==SH_NODE_TEXTURE) {
 			if ((r_mode & R_OSA) && node->id) {
 				Tex *tex= (Tex *)node->id;
@@ -177,7 +177,7 @@ static void gpu_stack_from_data_list(GPUNodeStack *gs, ListBase *sockets, bNodeS
 	bNodeSocket *sock;
 	int i;
 	
-	for (sock=sockets->first, i=0; sock; sock=sock->next, i++)
+	for (sock=sockets->first, i=0; sock; sock = sock->next, i++)
 		node_gpu_stack_from_data(&gs[i], sock->type, ns[i]);
 	
 	gs[i].type= GPU_NONE;
@@ -188,7 +188,7 @@ static void data_from_gpu_stack_list(ListBase *sockets, bNodeStack **ns, GPUNode
 	bNodeSocket *sock;
 	int i;
 
-	for (sock=sockets->first, i=0; sock; sock=sock->next, i++)
+	for (sock=sockets->first, i=0; sock; sock = sock->next, i++)
 		node_data_from_gpu_stack(ns[i], &gs[i]);
 }
 
@@ -200,12 +200,12 @@ bNode *nodeGetActiveTexture(bNodeTree *ntree)
 	if (!ntree)
 		return NULL;
 
-	for (node= ntree->nodes.first; node; node= node->next)
+	for (node = ntree->nodes.first; node; node = node->next)
 		if (node->flag & NODE_ACTIVE_TEXTURE)
 			return node;
 	
 	/* node active texture node in this tree, look inside groups */
-	for(node= ntree->nodes.first; node; node= node->next) {
+	for (node = ntree->nodes.first; node; node = node->next) {
 		if (node->type==NODE_GROUP) {
 			tnode = nodeGetActiveTexture((bNodeTree*)node->id);
 			if (tnode)
diff --git a/source/blender/nodes/shader/nodes/node_shader_add_shader.c b/source/blender/nodes/shader/nodes/node_shader_add_shader.c
index 75d4fb1a30a..92b8d2d8111 100644
--- a/source/blender/nodes/shader/nodes/node_shader_add_shader.c
+++ b/source/blender/nodes/shader/nodes/node_shader_add_shader.c
@@ -46,7 +46,7 @@ static int node_shader_gpu_add_shader(GPUMaterial *mat, bNode *UNUSED(node), bNo
 }
 
 /* node type definition */
-void register_node_type_sh_add_shader()
+void register_node_type_sh_add_shader(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c b/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c
index 85814c4a041..e3beb9e03b6 100644
--- a/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c
+++ b/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c
@@ -45,7 +45,7 @@ static int node_shader_gpu_ambient_occlusion(GPUMaterial *mat, bNode *UNUSED(nod
 }
 
 /* node type definition */
-void register_node_type_sh_ambient_occlusion()
+void register_node_type_sh_ambient_occlusion(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_attribute.c b/source/blender/nodes/shader/nodes/node_shader_attribute.c
index b6463655755..e3887a1d14d 100644
--- a/source/blender/nodes/shader/nodes/node_shader_attribute.c
+++ b/source/blender/nodes/shader/nodes/node_shader_attribute.c
@@ -43,7 +43,7 @@ static void node_shader_init_attribute(bNodeTree *UNUSED(ntree), bNode *node)
 }
 
 /* node type definition */
-void register_node_type_sh_attribute()
+void register_node_type_sh_attribute(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_background.c b/source/blender/nodes/shader/nodes/node_shader_background.c
index b109a2e4596..18be896e9aa 100644
--- a/source/blender/nodes/shader/nodes/node_shader_background.c
+++ b/source/blender/nodes/shader/nodes/node_shader_background.c
@@ -41,7 +41,7 @@ static bNodeSocketTemplate sh_node_background_out[] = {
 };
 
 /* node type definition */
-void register_node_type_sh_background()
+void register_node_type_sh_background(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_brightness.c b/source/blender/nodes/shader/nodes/node_shader_brightness.c
index ccdbddadb14..94f7b8ff86f 100644
--- a/source/blender/nodes/shader/nodes/node_shader_brightness.c
+++ b/source/blender/nodes/shader/nodes/node_shader_brightness.c
@@ -48,7 +48,7 @@ static int gpu_shader_brightcontrast(GPUMaterial *mat, bNode *UNUSED(node), bNod
 	return GPU_stack_link(mat, "brightness_contrast", in, out);
 }
 
-void register_node_type_sh_brightcontrast()
+void register_node_type_sh_brightcontrast(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c b/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
index e4b9c372607..75923133133 100644
--- a/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
+++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
@@ -53,7 +53,7 @@ static int node_shader_gpu_bsdf_anisotropic(GPUMaterial *mat, bNode *UNUSED(node
 }
 
 /* node type definition */
-void register_node_type_sh_bsdf_anisotropic()
+void register_node_type_sh_bsdf_anisotropic(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c b/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
index 466c2db07d4..bc764e26666 100644
--- a/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
+++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
@@ -50,7 +50,7 @@ static int node_shader_gpu_bsdf_diffuse(GPUMaterial *mat, bNode *UNUSED(node), b
 }
 
 /* node type definition */
-void register_node_type_sh_bsdf_diffuse()
+void register_node_type_sh_bsdf_diffuse(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c b/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
index b36a754e129..fe56a54011d 100644
--- a/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
+++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
@@ -51,7 +51,7 @@ static int node_shader_gpu_bsdf_glass(GPUMaterial *mat, bNode *UNUSED(node), bNo
 }
 
 /* node type definition */
-void register_node_type_sh_bsdf_glass()
+void register_node_type_sh_bsdf_glass(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c b/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
index 00d4f18fe65..81f15f3c5a8 100644
--- a/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
+++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
@@ -50,7 +50,7 @@ static int node_shader_gpu_bsdf_glossy(GPUMaterial *mat, bNode *UNUSED(node), bN
 }
 
 /* node type definition */
-void register_node_type_sh_bsdf_glossy()
+void register_node_type_sh_bsdf_glossy(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.c b/source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.c
index e8509c489ef..a14c1050812 100644
--- a/source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.c
+++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.c
@@ -51,7 +51,7 @@ static int node_shader_gpu_bsdf_refraction(GPUMaterial *mat, bNode *UNUSED(node)
 }
 
 /* node type definition */
-void register_node_type_sh_bsdf_refraction()
+void register_node_type_sh_bsdf_refraction(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c b/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
index ab4ced3f99e..1ef807fd5ac 100644
--- a/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
+++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
@@ -49,7 +49,7 @@ static int node_shader_gpu_bsdf_translucent(GPUMaterial *mat, bNode *UNUSED(node
 }
 
 /* node type definition */
-void register_node_type_sh_bsdf_translucent()
+void register_node_type_sh_bsdf_translucent(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.c b/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.c
index 843454dbb3e..bdd9de6a3c4 100644
--- a/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.c
+++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.c
@@ -45,7 +45,7 @@ static int node_shader_gpu_bsdf_transparent(GPUMaterial *mat, bNode *UNUSED(node
 }
 
 /* node type definition */
-void register_node_type_sh_bsdf_transparent()
+void register_node_type_sh_bsdf_transparent(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c b/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
index ff9fd3a07fe..eeb1365bc43 100644
--- a/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
+++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
@@ -50,7 +50,7 @@ static int node_shader_gpu_bsdf_velvet(GPUMaterial *mat, bNode *UNUSED(node), bN
 }
 
 /* node type definition */
-void register_node_type_sh_bsdf_velvet()
+void register_node_type_sh_bsdf_velvet(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_bump.c b/source/blender/nodes/shader/nodes/node_shader_bump.c
index 00733ebaf5c..ef57604e07a 100644
--- a/source/blender/nodes/shader/nodes/node_shader_bump.c
+++ b/source/blender/nodes/shader/nodes/node_shader_bump.c
@@ -52,7 +52,7 @@ static int gpu_shader_bump(GPUMaterial *mat, bNode *UNUSED(node), bNodeExecData
 }
 
 /* node type definition */
-void register_node_type_sh_bump()
+void register_node_type_sh_bump(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_camera.c b/source/blender/nodes/shader/nodes/node_shader_camera.c
index 8a406bc7f74..aee89a02ee1 100644
--- a/source/blender/nodes/shader/nodes/node_shader_camera.c
+++ b/source/blender/nodes/shader/nodes/node_shader_camera.c
@@ -57,7 +57,7 @@ static int gpu_shader_camera(GPUMaterial *mat, bNode *UNUSED(node), bNodeExecDat
 	return GPU_stack_link(mat, "camera", in, out, GPU_builtin(GPU_VIEW_POSITION));
 }
 
-void register_node_type_sh_camera()
+void register_node_type_sh_camera(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_common.c b/source/blender/nodes/shader/nodes/node_shader_common.c
index 8c148b86610..155aa508ed9 100644
--- a/source/blender/nodes/shader/nodes/node_shader_common.c
+++ b/source/blender/nodes/shader/nodes/node_shader_common.c
@@ -221,7 +221,7 @@ static int gpu_group_execute(GPUMaterial *mat, bNode *node, bNodeExecData *execd
 	return 1;
 }
 
-void register_node_type_sh_group()
+void register_node_type_sh_group(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/shader/nodes/node_shader_curves.c b/source/blender/nodes/shader/nodes/node_shader_curves.c
index 7a6d4a08db0..b293b02cfe6 100644
--- a/source/blender/nodes/shader/nodes/node_shader_curves.c
+++ b/source/blender/nodes/shader/nodes/node_shader_curves.c
@@ -69,7 +69,7 @@ static int gpu_shader_curve_vec(GPUMaterial *mat, bNode *node, bNodeExecData *UN
 	return GPU_stack_link(mat, "curves_vec", in, out, GPU_texture(size, array));
 }
 
-void register_node_type_sh_curve_vec()
+void register_node_type_sh_curve_vec(void)
 {
 	static bNodeType ntype;
 
@@ -126,7 +126,7 @@ static int gpu_shader_curve_rgb(GPUMaterial *mat, bNode *node, bNodeExecData *UN
 	return GPU_stack_link(mat, "curves_rgb", in, out, GPU_texture(size, array));
 }
 
-void register_node_type_sh_curve_rgb()
+void register_node_type_sh_curve_rgb(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_emission.c b/source/blender/nodes/shader/nodes/node_shader_emission.c
index d330afbdabe..e11f199bbd0 100644
--- a/source/blender/nodes/shader/nodes/node_shader_emission.c
+++ b/source/blender/nodes/shader/nodes/node_shader_emission.c
@@ -46,7 +46,7 @@ static int node_shader_gpu_emission(GPUMaterial *mat, bNode *UNUSED(node), bNode
 }
 
 /* node type definition */
-void register_node_type_sh_emission()
+void register_node_type_sh_emission(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_fresnel.c b/source/blender/nodes/shader/nodes/node_shader_fresnel.c
index fe15cc9bc04..d627edebfa7 100644
--- a/source/blender/nodes/shader/nodes/node_shader_fresnel.c
+++ b/source/blender/nodes/shader/nodes/node_shader_fresnel.c
@@ -45,7 +45,7 @@ static int node_shader_gpu_fresnel(GPUMaterial *mat, bNode *UNUSED(node), bNodeE
 }
 
 /* node type definition */
-void register_node_type_sh_fresnel()
+void register_node_type_sh_fresnel(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_gamma.c b/source/blender/nodes/shader/nodes/node_shader_gamma.c
index 35b01cfb73e..c5dafbe55d1 100644
--- a/source/blender/nodes/shader/nodes/node_shader_gamma.c
+++ b/source/blender/nodes/shader/nodes/node_shader_gamma.c
@@ -41,7 +41,7 @@ static bNodeSocketTemplate sh_node_gamma_out[] = {
 	{	-1, 0, ""	}
 };
 
-void register_node_type_sh_gamma()
+void register_node_type_sh_gamma(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/shader/nodes/node_shader_geom.c b/source/blender/nodes/shader/nodes/node_shader_geom.c
index 166e9453f35..40ba2cca4e5 100644
--- a/source/blender/nodes/shader/nodes/node_shader_geom.c
+++ b/source/blender/nodes/shader/nodes/node_shader_geom.c
@@ -138,7 +138,7 @@ static int gpu_shader_geom(GPUMaterial *mat, bNode *node, bNodeExecData *UNUSED(
 }
 
 /* node type definition */
-void register_node_type_sh_geom()
+void register_node_type_sh_geom(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_geometry.c b/source/blender/nodes/shader/nodes/node_shader_geometry.c
index f57caa2f798..c9626576833 100644
--- a/source/blender/nodes/shader/nodes/node_shader_geometry.c
+++ b/source/blender/nodes/shader/nodes/node_shader_geometry.c
@@ -48,7 +48,7 @@ static int node_shader_gpu_geometry(GPUMaterial *mat, bNode *UNUSED(node), bNode
 }
 
 /* node type definition */
-void register_node_type_sh_geometry()
+void register_node_type_sh_geometry(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_hair_info.c b/source/blender/nodes/shader/nodes/node_shader_hair_info.c
index f03373ad066..86c31086190 100644
--- a/source/blender/nodes/shader/nodes/node_shader_hair_info.c
+++ b/source/blender/nodes/shader/nodes/node_shader_hair_info.c
@@ -36,7 +36,7 @@ static bNodeSocketTemplate outputs[] = {
 };
 
 /* node type definition */
-void register_node_type_sh_hair_info()
+void register_node_type_sh_hair_info(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_holdout.c b/source/blender/nodes/shader/nodes/node_shader_holdout.c
index 04769cad590..9024cb507ed 100644
--- a/source/blender/nodes/shader/nodes/node_shader_holdout.c
+++ b/source/blender/nodes/shader/nodes/node_shader_holdout.c
@@ -40,7 +40,7 @@ static bNodeSocketTemplate sh_node_holdout_out[] = {
 
 
 /* node type definition */
-void register_node_type_sh_holdout()
+void register_node_type_sh_holdout(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c b/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
index f4a5462b8cc..559d9289fb7 100644
--- a/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
+++ b/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
@@ -80,7 +80,7 @@ static int gpu_shader_hue_sat(GPUMaterial *mat, bNode *UNUSED(node), bNodeExecDa
 	return GPU_stack_link(mat, "hue_sat", in, out);
 }
 
-void register_node_type_sh_hue_sat()
+void register_node_type_sh_hue_sat(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_invert.c b/source/blender/nodes/shader/nodes/node_shader_invert.c
index f3d4efc82d7..193ea93f54a 100644
--- a/source/blender/nodes/shader/nodes/node_shader_invert.c
+++ b/source/blender/nodes/shader/nodes/node_shader_invert.c
@@ -72,7 +72,7 @@ static int gpu_shader_invert(GPUMaterial *mat, bNode *UNUSED(node), bNodeExecDat
 	return GPU_stack_link(mat, "invert", in, out);
 }
 
-void register_node_type_sh_invert()
+void register_node_type_sh_invert(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_layer_weight.c b/source/blender/nodes/shader/nodes/node_shader_layer_weight.c
index 5b7cb4730ae..f342cb07e30 100644
--- a/source/blender/nodes/shader/nodes/node_shader_layer_weight.c
+++ b/source/blender/nodes/shader/nodes/node_shader_layer_weight.c
@@ -46,7 +46,7 @@ static int node_shader_gpu_layer_weight(GPUMaterial *UNUSED(mat), bNode *UNUSED(
 }
 
 /* node type definition */
-void register_node_type_sh_layer_weight()
+void register_node_type_sh_layer_weight(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_light_path.c b/source/blender/nodes/shader/nodes/node_shader_light_path.c
index 93efc5abfa4..0b1f34f6a02 100644
--- a/source/blender/nodes/shader/nodes/node_shader_light_path.c
+++ b/source/blender/nodes/shader/nodes/node_shader_light_path.c
@@ -47,7 +47,7 @@ static int node_shader_gpu_light_path(GPUMaterial *mat, bNode *UNUSED(node), bNo
 }
 
 /* node type definition */
-void register_node_type_sh_light_path()
+void register_node_type_sh_light_path(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_mapping.c b/source/blender/nodes/shader/nodes/node_shader_mapping.c
index fc3ef736737..910bf06c068 100644
--- a/source/blender/nodes/shader/nodes/node_shader_mapping.c
+++ b/source/blender/nodes/shader/nodes/node_shader_mapping.c
@@ -86,7 +86,7 @@ static int gpu_shader_mapping(GPUMaterial *mat, bNode *node, bNodeExecData *UNUS
 	return GPU_stack_link(mat, "mapping", in, out, tmat, tmin, tmax, tdomin, tdomax);
 }
 
-void register_node_type_sh_mapping()
+void register_node_type_sh_mapping(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/shader/nodes/node_shader_material.c b/source/blender/nodes/shader/nodes/node_shader_material.c
index 29612ff74e2..aee280760ba 100644
--- a/source/blender/nodes/shader/nodes/node_shader_material.c
+++ b/source/blender/nodes/shader/nodes/node_shader_material.c
@@ -91,7 +91,7 @@ static void node_shader_exec_material(void *data, int UNUSED(thread), bNode *nod
 		 * we just want to know if a node input uses external data or the material setting.
 		 * this is an ugly hack, but so is this node as a whole.
 		 */
-		for (sock=node->inputs.first, i=0; sock; sock=sock->next, ++i)
+		for (sock = node->inputs.first, i=0; sock; sock = sock->next, ++i)
 			hasinput[i] = (sock->link != NULL);
 		
 		shi= shcd->shi;
@@ -236,7 +236,7 @@ static int gpu_shader_material(GPUMaterial *mat, bNode *node, bNodeExecData *UNU
 		 * the constant input stack values (e.g. in case material node is inside a group).
 		 * we just want to know if a node input uses external data or the material setting.
 		 */
-		for (sock=node->inputs.first, i=0; sock; sock=sock->next, ++i)
+		for (sock = node->inputs.first, i=0; sock; sock = sock->next, ++i)
 			hasinput[i] = (sock->link != NULL);
 
 		GPU_shadeinput_set(mat, (Material*)node->id, &shi);
@@ -307,7 +307,7 @@ static int gpu_shader_material(GPUMaterial *mat, bNode *node, bNodeExecData *UNU
 	return 0;
 }
 
-void register_node_type_sh_material()
+void register_node_type_sh_material(void)
 {
 	static bNodeType ntype;
 
@@ -323,7 +323,7 @@ void register_node_type_sh_material()
 }
 
 
-void register_node_type_sh_material_ext()
+void register_node_type_sh_material_ext(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_math.c b/source/blender/nodes/shader/nodes/node_shader_math.c
index 08ba48176bb..31a1501bc3f 100644
--- a/source/blender/nodes/shader/nodes/node_shader_math.c
+++ b/source/blender/nodes/shader/nodes/node_shader_math.c
@@ -255,7 +255,7 @@ static int gpu_shader_math(GPUMaterial *mat, bNode *node, bNodeExecData *UNUSED(
 	return 1;
 }
 
-void register_node_type_sh_math()
+void register_node_type_sh_math(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_mixRgb.c b/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
index 2bbdf91dc65..982eaa228d1 100644
--- a/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
+++ b/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
@@ -73,7 +73,7 @@ static int gpu_shader_mix_rgb(GPUMaterial *mat, bNode *node, bNodeExecData *UNUS
 }
 
 
-void register_node_type_sh_mix_rgb()
+void register_node_type_sh_mix_rgb(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_mix_shader.c b/source/blender/nodes/shader/nodes/node_shader_mix_shader.c
index 56178a8ddbe..077fd71d191 100644
--- a/source/blender/nodes/shader/nodes/node_shader_mix_shader.c
+++ b/source/blender/nodes/shader/nodes/node_shader_mix_shader.c
@@ -47,7 +47,7 @@ static int node_shader_gpu_mix_shader(GPUMaterial *mat, bNode *UNUSED(node), bNo
 }
 
 /* node type definition */
-void register_node_type_sh_mix_shader()
+void register_node_type_sh_mix_shader(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_normal.c b/source/blender/nodes/shader/nodes/node_shader_normal.c
index a1f00ee0c33..ba32a7e0924 100644
--- a/source/blender/nodes/shader/nodes/node_shader_normal.c
+++ b/source/blender/nodes/shader/nodes/node_shader_normal.c
@@ -64,7 +64,7 @@ static int gpu_shader_normal(GPUMaterial *mat, bNode *UNUSED(node), bNodeExecDat
 	return GPU_stack_link(mat, "normal", in, out, vec);
 }
 
-void register_node_type_sh_normal()
+void register_node_type_sh_normal(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/shader/nodes/node_shader_normal_map.c b/source/blender/nodes/shader/nodes/node_shader_normal_map.c
index bca1b0e2798..d971df215e9 100644
--- a/source/blender/nodes/shader/nodes/node_shader_normal_map.c
+++ b/source/blender/nodes/shader/nodes/node_shader_normal_map.c
@@ -52,7 +52,7 @@ static int gpu_shader_normal_map(GPUMaterial *mat, bNode *UNUSED(node), bNodeExe
 }
 
 /* node type definition */
-void register_node_type_sh_normal_map()
+void register_node_type_sh_normal_map(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_output.c b/source/blender/nodes/shader/nodes/node_shader_output.c
index 4c2fdf146da..c317fe0f58a 100644
--- a/source/blender/nodes/shader/nodes/node_shader_output.c
+++ b/source/blender/nodes/shader/nodes/node_shader_output.c
@@ -80,7 +80,7 @@ static int gpu_shader_output(GPUMaterial *mat, bNode *UNUSED(node), bNodeExecDat
 	return 1;
 }
 
-void register_node_type_sh_output()
+void register_node_type_sh_output(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_output_lamp.c b/source/blender/nodes/shader/nodes/node_shader_output_lamp.c
index e44326428b5..5bb45fe63f6 100644
--- a/source/blender/nodes/shader/nodes/node_shader_output_lamp.c
+++ b/source/blender/nodes/shader/nodes/node_shader_output_lamp.c
@@ -35,7 +35,7 @@ static bNodeSocketTemplate sh_node_output_lamp_in[] = {
 };
 
 /* node type definition */
-void register_node_type_sh_output_lamp()
+void register_node_type_sh_output_lamp(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_output_material.c b/source/blender/nodes/shader/nodes/node_shader_output_material.c
index 90030d6699b..ddaee944f93 100644
--- a/source/blender/nodes/shader/nodes/node_shader_output_material.c
+++ b/source/blender/nodes/shader/nodes/node_shader_output_material.c
@@ -48,7 +48,7 @@ static int node_shader_gpu_output_material(GPUMaterial *mat, bNode *UNUSED(node)
 
 
 /* node type definition */
-void register_node_type_sh_output_material()
+void register_node_type_sh_output_material(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_output_world.c b/source/blender/nodes/shader/nodes/node_shader_output_world.c
index e9a60bd34e3..99663489635 100644
--- a/source/blender/nodes/shader/nodes/node_shader_output_world.c
+++ b/source/blender/nodes/shader/nodes/node_shader_output_world.c
@@ -36,7 +36,7 @@ static bNodeSocketTemplate sh_node_output_world_in[] = {
 };
 
 /* node type definition */
-void register_node_type_sh_output_world()
+void register_node_type_sh_output_world(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_rgb.c b/source/blender/nodes/shader/nodes/node_shader_rgb.c
index b3215fc6803..f0c90b65823 100644
--- a/source/blender/nodes/shader/nodes/node_shader_rgb.c
+++ b/source/blender/nodes/shader/nodes/node_shader_rgb.c
@@ -44,7 +44,7 @@ static int gpu_shader_rgb(GPUMaterial *mat, bNode *UNUSED(node), bNodeExecData *
 	return GPU_stack_link(mat, "set_rgba", in, out, vec);
 }
 
-void register_node_type_sh_rgb()
+void register_node_type_sh_rgb(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_script.c b/source/blender/nodes/shader/nodes/node_shader_script.c
index 8b4c2702474..6666197770f 100644
--- a/source/blender/nodes/shader/nodes/node_shader_script.c
+++ b/source/blender/nodes/shader/nodes/node_shader_script.c
@@ -65,7 +65,7 @@ static void node_copy_script(bNodeTree *UNUSED(dest_ntree), bNode *dest_node, bN
 	dest_node->storage = dest_nss;
 }
 
-void register_node_type_sh_script()
+void register_node_type_sh_script(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c b/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
index 1f6cd3506e9..c0ed9dc6a3e 100644
--- a/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
+++ b/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
@@ -56,7 +56,7 @@ static int gpu_shader_seprgb(GPUMaterial *mat, bNode *UNUSED(node), bNodeExecDat
 	return GPU_stack_link(mat, "separate_rgb", in, out);
 }
 
-void register_node_type_sh_seprgb()
+void register_node_type_sh_seprgb(void)
 {
 	static bNodeType ntype;
 
@@ -96,7 +96,7 @@ static int gpu_shader_combrgb(GPUMaterial *mat, bNode *UNUSED(node), bNodeExecDa
 	return GPU_stack_link(mat, "combine_rgb", in, out);
 }
 
-void register_node_type_sh_combrgb()
+void register_node_type_sh_combrgb(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_squeeze.c b/source/blender/nodes/shader/nodes/node_shader_squeeze.c
index 538efb15cb3..ad2e7353ac8 100644
--- a/source/blender/nodes/shader/nodes/node_shader_squeeze.c
+++ b/source/blender/nodes/shader/nodes/node_shader_squeeze.c
@@ -61,7 +61,7 @@ static int gpu_shader_squeeze(GPUMaterial *mat, bNode *UNUSED(node), bNodeExecDa
 	return GPU_stack_link(mat, "squeeze", in, out);
 }
 
-void register_node_type_sh_squeeze()
+void register_node_type_sh_squeeze(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_tangent.c b/source/blender/nodes/shader/nodes/node_shader_tangent.c
index a51c943285b..3f4c59f81ee 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tangent.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tangent.c
@@ -42,7 +42,7 @@ static void node_shader_init_tangent(bNodeTree *UNUSED(ntree), bNode *node)
 }
 
 /* node type definition */
-void register_node_type_sh_tangent()
+void register_node_type_sh_tangent(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_checker.c b/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
index aff92e58f90..dff533c4d80 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
@@ -63,7 +63,7 @@ static int node_shader_gpu_tex_checker(GPUMaterial *mat, bNode *node, bNodeExecD
 }
 
 /* node type definition */
-void register_node_type_sh_tex_checker()
+void register_node_type_sh_tex_checker(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_coord.c b/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
index d2b69aebf96..5af5477e5c7 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
@@ -53,7 +53,7 @@ static int node_shader_gpu_tex_coord(GPUMaterial *mat, bNode *UNUSED(node), bNod
 }
 
 /* node type definition */
-void register_node_type_sh_tex_coord()
+void register_node_type_sh_tex_coord(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_environment.c b/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
index 25cc892c944..05352e810c0 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
@@ -88,7 +88,7 @@ static int node_shader_gpu_tex_environment(GPUMaterial *mat, bNode *node, bNodeE
 }
 
 /* node type definition */
-void register_node_type_sh_tex_environment()
+void register_node_type_sh_tex_environment(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c b/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
index ab962c946f2..5f559f9d0d6 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
@@ -61,7 +61,7 @@ static int node_shader_gpu_tex_gradient(GPUMaterial *mat, bNode *node, bNodeExec
 }
 
 /* node type definition */
-void register_node_type_sh_tex_gradient()
+void register_node_type_sh_tex_gradient(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_image.c b/source/blender/nodes/shader/nodes/node_shader_tex_image.c
index a30acd80712..6a28414e8c4 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_image.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_image.c
@@ -88,7 +88,7 @@ static int node_shader_gpu_tex_image(GPUMaterial *mat, bNode *node, bNodeExecDat
 }
 
 /* node type definition */
-void register_node_type_sh_tex_image()
+void register_node_type_sh_tex_image(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_magic.c b/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
index 8d32cac9dab..c7c29f2c17a 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
@@ -66,7 +66,7 @@ static int node_shader_gpu_tex_magic(GPUMaterial *mat, bNode *node, bNodeExecDat
 }
 
 /* node type definition */
-void register_node_type_sh_tex_magic()
+void register_node_type_sh_tex_magic(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c b/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
index d4f7c9d0c1c..ae77c13c929 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
@@ -67,7 +67,7 @@ static int node_shader_gpu_tex_musgrave(GPUMaterial *mat, bNode *node, bNodeExec
 }
 
 /* node type definition */
-void register_node_type_sh_tex_musgrave()
+void register_node_type_sh_tex_musgrave(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_noise.c b/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
index 0143645f448..3d3f4c86547 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
@@ -63,7 +63,7 @@ static int node_shader_gpu_tex_noise(GPUMaterial *mat, bNode *node, bNodeExecDat
 }
 
 /* node type definition */
-void register_node_type_sh_tex_noise()
+void register_node_type_sh_tex_noise(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_sky.c b/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
index 2aa977bade6..e92ff5ddade 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
@@ -63,7 +63,7 @@ static int node_shader_gpu_tex_sky(GPUMaterial *mat, bNode *node, bNodeExecData
 }
 
 /* node type definition */
-void register_node_type_sh_tex_sky()
+void register_node_type_sh_tex_sky(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c b/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
index cf7d775914e..89856864036 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
@@ -62,7 +62,7 @@ static int node_shader_gpu_tex_voronoi(GPUMaterial *mat, bNode *node, bNodeExecD
 }
 
 /* node type definition */
-void register_node_type_sh_tex_voronoi()
+void register_node_type_sh_tex_voronoi(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_wave.c b/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
index 2f085df8d07..22edacd347d 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
@@ -65,7 +65,7 @@ static int node_shader_gpu_tex_wave(GPUMaterial *mat, bNode *node, bNodeExecData
 }
 
 /* node type definition */
-void register_node_type_sh_tex_wave()
+void register_node_type_sh_tex_wave(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_texture.c b/source/blender/nodes/shader/nodes/node_shader_texture.c
index 4f6cc574be3..1ff315f6b80 100644
--- a/source/blender/nodes/shader/nodes/node_shader_texture.c
+++ b/source/blender/nodes/shader/nodes/node_shader_texture.c
@@ -144,7 +144,7 @@ static int gpu_shader_texture(GPUMaterial *mat, bNode *node, bNodeExecData *UNUS
 		return 0;
 }
 
-void register_node_type_sh_texture()
+void register_node_type_sh_texture(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_valToRgb.c b/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
index e70ac6b700e..d5f0bf30966 100644
--- a/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
+++ b/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
@@ -59,7 +59,7 @@ static void node_shader_exec_valtorgb(void *UNUSED(data), int UNUSED(thread), bN
 
 static void node_shader_init_valtorgb(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	node->storage= add_colorband(1);
+	node->storage= add_colorband(true);
 }
 
 static int gpu_shader_valtorgb(GPUMaterial *mat, bNode *node, bNodeExecData *UNUSED(execdata), GPUNodeStack *in, GPUNodeStack *out)
@@ -71,7 +71,7 @@ static int gpu_shader_valtorgb(GPUMaterial *mat, bNode *node, bNodeExecData *UNU
 	return GPU_stack_link(mat, "valtorgb", in, out, GPU_texture(size, array));
 }
 
-void register_node_type_sh_valtorgb()
+void register_node_type_sh_valtorgb(void)
 {
 	static bNodeType ntype;
 
@@ -112,7 +112,7 @@ static int gpu_shader_rgbtobw(GPUMaterial *mat, bNode *UNUSED(node), bNodeExecDa
 	return GPU_stack_link(mat, "rgbtobw", in, out);
 }
 
-void register_node_type_sh_rgbtobw()
+void register_node_type_sh_rgbtobw(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_value.c b/source/blender/nodes/shader/nodes/node_shader_value.c
index 00a23283a14..f4aef926f64 100644
--- a/source/blender/nodes/shader/nodes/node_shader_value.c
+++ b/source/blender/nodes/shader/nodes/node_shader_value.c
@@ -44,7 +44,7 @@ static int gpu_shader_value(GPUMaterial *mat, bNode *UNUSED(node), bNodeExecData
 	return GPU_stack_link(mat, "set_value", in, out, vec);
 }
 
-void register_node_type_sh_value()
+void register_node_type_sh_value(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_vectMath.c b/source/blender/nodes/shader/nodes/node_shader_vectMath.c
index 7a76f408916..9eb3c5a14e4 100644
--- a/source/blender/nodes/shader/nodes/node_shader_vectMath.c
+++ b/source/blender/nodes/shader/nodes/node_shader_vectMath.c
@@ -139,7 +139,7 @@ static int gpu_shader_vect_math(GPUMaterial *mat, bNode *node, bNodeExecData *UN
 	return 1;
 }
 
-void register_node_type_sh_vect_math()
+void register_node_type_sh_vect_math(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_volume_isotropic.c b/source/blender/nodes/shader/nodes/node_shader_volume_isotropic.c
index 5ce62e2e15b..458fbf43625 100644
--- a/source/blender/nodes/shader/nodes/node_shader_volume_isotropic.c
+++ b/source/blender/nodes/shader/nodes/node_shader_volume_isotropic.c
@@ -46,7 +46,7 @@ static int node_shader_gpu_volume_isotropic(GPUMaterial *UNUSED(mat), bNode *UNU
 }
 
 /* node type definition */
-void register_node_type_sh_volume_isotropic()
+void register_node_type_sh_volume_isotropic(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_volume_transparent.c b/source/blender/nodes/shader/nodes/node_shader_volume_transparent.c
index cd4ad5d0080..c9bac06cbb0 100644
--- a/source/blender/nodes/shader/nodes/node_shader_volume_transparent.c
+++ b/source/blender/nodes/shader/nodes/node_shader_volume_transparent.c
@@ -46,7 +46,7 @@ static int node_shader_gpu_volume_transparent(GPUMaterial *UNUSED(mat), bNode *U
 }
 
 /* node type definition */
-void register_node_type_sh_volume_transparent()
+void register_node_type_sh_volume_transparent(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/texture/node_texture_tree.c b/source/blender/nodes/texture/node_texture_tree.c
index 0690ccdd19f..e1a29a67446 100644
--- a/source/blender/nodes/texture/node_texture_tree.c
+++ b/source/blender/nodes/texture/node_texture_tree.c
@@ -154,7 +154,7 @@ static void update(bNodeTree *ntree)
 
 bNodeTreeType *ntreeType_Texture;
 
-void register_node_tree_type_tex()
+void register_node_tree_type_tex(void)
 {
 	bNodeTreeType *tt = ntreeType_Texture = MEM_callocN(sizeof(bNodeTreeType), "texture node tree type");
 	
diff --git a/source/blender/nodes/texture/nodes/node_texture_at.c b/source/blender/nodes/texture/nodes/node_texture_at.c
index ef930a39fe3..aafb9793d2c 100644
--- a/source/blender/nodes/texture/nodes/node_texture_at.c
+++ b/source/blender/nodes/texture/nodes/node_texture_at.c
@@ -58,7 +58,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
 	tex_output(node, execdata, in, out[0], &colorfn, data);
 }
 
-void register_node_type_tex_at()
+void register_node_type_tex_at(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/texture/nodes/node_texture_bricks.c b/source/blender/nodes/texture/nodes/node_texture_bricks.c
index afcbf4216c3..15cde299f35 100644
--- a/source/blender/nodes/texture/nodes/node_texture_bricks.c
+++ b/source/blender/nodes/texture/nodes/node_texture_bricks.c
@@ -121,7 +121,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
 	tex_output(node, execdata, in, out[0], &colorfn, data);
 }
 
-void register_node_type_tex_bricks()
+void register_node_type_tex_bricks(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/texture/nodes/node_texture_checker.c b/source/blender/nodes/texture/nodes/node_texture_checker.c
index 53c91db0312..77c6a2e3010 100644
--- a/source/blender/nodes/texture/nodes/node_texture_checker.c
+++ b/source/blender/nodes/texture/nodes/node_texture_checker.c
@@ -70,7 +70,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
 	tex_output(node, execdata, in, out[0], &colorfn, data);
 }
 
-void register_node_type_tex_checker()
+void register_node_type_tex_checker(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/texture/nodes/node_texture_common.c b/source/blender/nodes/texture/nodes/node_texture_common.c
index 2af2a3a1999..e884d50dc05 100644
--- a/source/blender/nodes/texture/nodes/node_texture_common.c
+++ b/source/blender/nodes/texture/nodes/node_texture_common.c
@@ -149,7 +149,7 @@ static void group_execute(void *data, int thread, struct bNode *node, bNodeExecD
 	ntreeReleaseThreadStack(nts);
 }
 
-void register_node_type_tex_group()
+void register_node_type_tex_group(void)
 {
 	static bNodeType ntype;
 
diff --git a/source/blender/nodes/texture/nodes/node_texture_compose.c b/source/blender/nodes/texture/nodes/node_texture_compose.c
index ddaae829da9..065d16a5784 100644
--- a/source/blender/nodes/texture/nodes/node_texture_compose.c
+++ b/source/blender/nodes/texture/nodes/node_texture_compose.c
@@ -57,7 +57,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
 	tex_output(node, execdata, in, out[0], &colorfn, data);
 }
 
-void register_node_type_tex_compose()
+void register_node_type_tex_compose(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/texture/nodes/node_texture_coord.c b/source/blender/nodes/texture/nodes/node_texture_coord.c
index 94793288ec3..b313e1f67ac 100644
--- a/source/blender/nodes/texture/nodes/node_texture_coord.c
+++ b/source/blender/nodes/texture/nodes/node_texture_coord.c
@@ -48,7 +48,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
 	tex_output(node, execdata, in, out[0], &vectorfn, data);
 }
 
-void register_node_type_tex_coord()
+void register_node_type_tex_coord(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/texture/nodes/node_texture_curves.c b/source/blender/nodes/texture/nodes/node_texture_curves.c
index 94235eae93c..1778eeaeffa 100644
--- a/source/blender/nodes/texture/nodes/node_texture_curves.c
+++ b/source/blender/nodes/texture/nodes/node_texture_curves.c
@@ -67,7 +67,7 @@ static void time_init(bNodeTree *UNUSED(ntree), bNode *node)
 	node->storage= curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
 }
 
-void register_node_type_tex_curve_time()
+void register_node_type_tex_curve_time(void)
 {
 	static bNodeType ntype;
 	
@@ -111,7 +111,7 @@ static void rgb_init(bNodeTree *UNUSED(ntree), bNode *node)
 	node->storage= curvemapping_add(4, 0.0f, 0.0f, 1.0f, 1.0f);
 }
 
-void register_node_type_tex_curve_rgb()
+void register_node_type_tex_curve_rgb(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/texture/nodes/node_texture_decompose.c b/source/blender/nodes/texture/nodes/node_texture_decompose.c
index fa2c1d6398f..1207377d150 100644
--- a/source/blender/nodes/texture/nodes/node_texture_decompose.c
+++ b/source/blender/nodes/texture/nodes/node_texture_decompose.c
@@ -78,7 +78,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
 	tex_output(node, execdata, in, out[3], &valuefn_a, data);
 }
 
-void register_node_type_tex_decompose()
+void register_node_type_tex_decompose(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/texture/nodes/node_texture_distance.c b/source/blender/nodes/texture/nodes/node_texture_distance.c
index fefa093481d..f47f9260337 100644
--- a/source/blender/nodes/texture/nodes/node_texture_distance.c
+++ b/source/blender/nodes/texture/nodes/node_texture_distance.c
@@ -61,7 +61,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
 	tex_output(node, execdata, in, out[0], &valuefn, data);
 }
 
-void register_node_type_tex_distance()
+void register_node_type_tex_distance(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c b/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
index c5acf01801c..56da4ad24c0 100644
--- a/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
+++ b/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
@@ -92,7 +92,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
 	tex_output(node, execdata, in, out[0], &colorfn, data);
 }
 
-void register_node_type_tex_hue_sat()
+void register_node_type_tex_hue_sat(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/texture/nodes/node_texture_image.c b/source/blender/nodes/texture/nodes/node_texture_image.c
index e897b0e4e96..57fa562ac0b 100644
--- a/source/blender/nodes/texture/nodes/node_texture_image.c
+++ b/source/blender/nodes/texture/nodes/node_texture_image.c
@@ -97,7 +97,7 @@ static void init(bNodeTree *UNUSED(ntree), bNode *node)
 	iuser->ok= 1;
 }
 
-void register_node_type_tex_image()
+void register_node_type_tex_image(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/texture/nodes/node_texture_invert.c b/source/blender/nodes/texture/nodes/node_texture_invert.c
index aa394bff8bc..fd6e2144e0e 100644
--- a/source/blender/nodes/texture/nodes/node_texture_invert.c
+++ b/source/blender/nodes/texture/nodes/node_texture_invert.c
@@ -63,7 +63,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
 	tex_output(node, execdata, in, out[0], &colorfn, data);
 }
 
-void register_node_type_tex_invert()
+void register_node_type_tex_invert(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/texture/nodes/node_texture_math.c b/source/blender/nodes/texture/nodes/node_texture_math.c
index e83579070a9..499412e750d 100644
--- a/source/blender/nodes/texture/nodes/node_texture_math.c
+++ b/source/blender/nodes/texture/nodes/node_texture_math.c
@@ -186,7 +186,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
 	tex_output(node, execdata, in, out[0], &valuefn, data);
 }
 
-void register_node_type_tex_math()
+void register_node_type_tex_math(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/texture/nodes/node_texture_mixRgb.c b/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
index 7a68af4b1e2..12ac27f26b7 100644
--- a/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
+++ b/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
@@ -64,7 +64,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
 	tex_output(node, execdata, in, out[0], &colorfn, data);
 }
 
-void register_node_type_tex_mix_rgb()
+void register_node_type_tex_mix_rgb(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/texture/nodes/node_texture_output.c b/source/blender/nodes/texture/nodes/node_texture_output.c
index 8c8f7622d29..f4086ed1eec 100644
--- a/source/blender/nodes/texture/nodes/node_texture_output.c
+++ b/source/blender/nodes/texture/nodes/node_texture_output.c
@@ -158,7 +158,7 @@ static void copy(bNodeTree *dest_ntree, bNode *dest_node, bNode *src_node)
 	assign_index(dest_node);
 }
 
-void register_node_type_tex_output()
+void register_node_type_tex_output(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/texture/nodes/node_texture_proc.c b/source/blender/nodes/texture/nodes/node_texture_proc.c
index 504e77ebb27..f7e7a585ae2 100644
--- a/source/blender/nodes/texture/nodes/node_texture_proc.c
+++ b/source/blender/nodes/texture/nodes/node_texture_proc.c
@@ -296,11 +296,11 @@ static void init(bNodeTree *UNUSED(ntree), bNode *node)
 
 /* Node type definitions */
 #define TexDef(TEXTYPE, outputs, name, Name) \
-void register_node_type_tex_proc_##name() \
+void register_node_type_tex_proc_##name(void) \
 { \
 	static bNodeType ntype; \
 	\
-	tex_node_type_base(&ntype, TEX_NODE_PROC+TEXTYPE, Name, NODE_CLASS_TEXTURE, NODE_PREVIEW|NODE_OPTIONS); \
+	tex_node_type_base(&ntype, TEX_NODE_PROC+TEXTYPE, Name, NODE_CLASS_TEXTURE, NODE_PREVIEW | NODE_OPTIONS); \
 	node_type_socket_templates(&ntype, name##_inputs, outputs); \
 	node_type_size(&ntype, 140, 80, 140); \
 	node_type_init(&ntype, init); \
diff --git a/source/blender/nodes/texture/nodes/node_texture_rotate.c b/source/blender/nodes/texture/nodes/node_texture_rotate.c
index 8f3f66dbee4..02a5a9e1a97 100644
--- a/source/blender/nodes/texture/nodes/node_texture_rotate.c
+++ b/source/blender/nodes/texture/nodes/node_texture_rotate.c
@@ -95,7 +95,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
 	tex_output(node, execdata, in, out[0], &colorfn, data);
 }
 
-void register_node_type_tex_rotate()
+void register_node_type_tex_rotate(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/texture/nodes/node_texture_scale.c b/source/blender/nodes/texture/nodes/node_texture_scale.c
index 67e0c064b7c..8eabdabc713 100644
--- a/source/blender/nodes/texture/nodes/node_texture_scale.c
+++ b/source/blender/nodes/texture/nodes/node_texture_scale.c
@@ -68,7 +68,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
 	tex_output(node, execdata, in, out[0], &colorfn, data);
 }
 
-void register_node_type_tex_scale()
+void register_node_type_tex_scale(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/texture/nodes/node_texture_texture.c b/source/blender/nodes/texture/nodes/node_texture_texture.c
index 9970c3c2a26..a42633cb2b4 100644
--- a/source/blender/nodes/texture/nodes/node_texture_texture.c
+++ b/source/blender/nodes/texture/nodes/node_texture_texture.c
@@ -95,7 +95,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
 	tex_output(node, execdata, in, out[0], &colorfn, data);
 }
 
-void register_node_type_tex_texture()
+void register_node_type_tex_texture(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/texture/nodes/node_texture_translate.c b/source/blender/nodes/texture/nodes/node_texture_translate.c
index 3d5db4f863a..55782fbecac 100644
--- a/source/blender/nodes/texture/nodes/node_texture_translate.c
+++ b/source/blender/nodes/texture/nodes/node_texture_translate.c
@@ -64,7 +64,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
 	tex_output(node, execdata, in, out[0], &colorfn, data);
 }
 
-void register_node_type_tex_translate()
+void register_node_type_tex_translate(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/texture/nodes/node_texture_valToNor.c b/source/blender/nodes/texture/nodes/node_texture_valToNor.c
index d7495f9833d..6be61c914db 100644
--- a/source/blender/nodes/texture/nodes/node_texture_valToNor.c
+++ b/source/blender/nodes/texture/nodes/node_texture_valToNor.c
@@ -80,7 +80,7 @@ static void exec(void *data, int UNUSED(thread), bNode *node, bNodeExecData *exe
 	tex_output(node, execdata, in, out[0], &normalfn, data);
 }
 
-void register_node_type_tex_valtonor()
+void register_node_type_tex_valtonor(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/texture/nodes/node_texture_valToRgb.c b/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
index fec89aa03eb..871cdab384e 100644
--- a/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
+++ b/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
@@ -59,10 +59,10 @@ static void valtorgb_exec(void *data, int UNUSED(thread), bNode *node, bNodeExec
 
 static void valtorgb_init(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	node->storage = add_colorband(1);
+	node->storage = add_colorband(true);
 }
 
-void register_node_type_tex_valtorgb()
+void register_node_type_tex_valtorgb(void)
 {
 	static bNodeType ntype;
 	
@@ -99,7 +99,7 @@ static void rgbtobw_exec(void *data, int UNUSED(thread), bNode *node, bNodeExecD
 	tex_output(node, execdata, in, out[0], &rgbtobw_valuefn, data);
 }
 
-void register_node_type_tex_rgbtobw()
+void register_node_type_tex_rgbtobw(void)
 {
 	static bNodeType ntype;
 	
diff --git a/source/blender/nodes/texture/nodes/node_texture_viewer.c b/source/blender/nodes/texture/nodes/node_texture_viewer.c
index 44724c9280f..4f7d54ab833 100644
--- a/source/blender/nodes/texture/nodes/node_texture_viewer.c
+++ b/source/blender/nodes/texture/nodes/node_texture_viewer.c
@@ -56,7 +56,7 @@ static void exec(void *data, int UNUSED(thread), bNode *UNUSED(node), bNodeExecD
 	}
 }
 
-void register_node_type_tex_viewer()
+void register_node_type_tex_viewer(void)
 {
 	static bNodeType ntype;