code cleanup

202 files changed, 720 insertions, 718 deletions

diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 513851ce18f..d9a311b7e13 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -329,8 +329,8 @@ typedef struct bNodeTreeType {
 /* ************** GENERIC API, TREES *************** */
 
 struct bNodeTreeType *ntreeTypeFind(const char *idname);
-void ntreeTypeAdd(struct bNodeTreeType* nt);
-void ntreeTypeFreeLink(struct bNodeTreeType* nt);
+void ntreeTypeAdd(struct bNodeTreeType *nt);
+void ntreeTypeFreeLink(struct bNodeTreeType *nt);
 struct GHashIterator *ntreeTypeGetIterator(void);
 
 /* helper macros for iterating over tree types */
@@ -405,8 +405,8 @@ void ntreeInterfaceTypeUpdate(struct bNodeTree *ntree);
 /* ************** GENERIC API, NODES *************** */
 
 struct bNodeType *nodeTypeFind(const char *idname);
-void			nodeRegisterType(struct bNodeType* ntype);
-void			nodeUnregisterType(struct bNodeType* ntype);
+void			nodeRegisterType(struct bNodeType *ntype);
+void			nodeUnregisterType(struct bNodeType *ntype);
 struct GHashIterator *nodeTypeGetIterator(void);
 
 /* helper macros for iterating over node types */
@@ -422,8 +422,8 @@ struct GHashIterator *nodeTypeGetIterator(void);
 }
 
 struct bNodeSocketType *nodeSocketTypeFind(const char *idname);
-void			nodeRegisterSocketType(struct bNodeSocketType* stype);
-void			nodeUnregisterSocketType(struct bNodeSocketType* stype);
+void			nodeRegisterSocketType(struct bNodeSocketType *stype);
+void			nodeUnregisterSocketType(struct bNodeSocketType *stype);
 struct GHashIterator *nodeSocketTypeGetIterator(void);
 const char *	nodeStaticSocketType(int type, int subtype);
 const char *	nodeStaticSocketInterfaceType(int type, int subtype);
@@ -485,7 +485,7 @@ void			nodeSetSelected(struct bNode *node, int select);
 void            nodeSetActive(struct bNodeTree *ntree, struct bNode *node);
 struct bNode   *nodeGetActive(struct bNodeTree *ntree);
 struct bNode   *nodeGetActiveID(struct bNodeTree *ntree, short idtype);
-int             nodeSetActiveID(struct bNodeTree *ntree, short idtype, struct ID *id);
+bool            nodeSetActiveID(struct bNodeTree *ntree, short idtype, struct ID *id);
 void            nodeClearActive(struct bNodeTree *ntree);
 void            nodeClearActiveID(struct bNodeTree *ntree, short idtype);
 struct bNode   *nodeGetActiveTexture(struct bNodeTree *ntree);
@@ -519,13 +519,13 @@ extern const bNodeInstanceKey NODE_INSTANCE_KEY_BASE;
 
 bNodeInstanceKey       BKE_node_instance_key(bNodeInstanceKey parent_key, struct bNodeTree *ntree, struct bNode *node);
 
-bNodeInstanceHash *    BKE_node_instance_hash_new(const char *info);
+bNodeInstanceHash     *BKE_node_instance_hash_new(const char *info);
 void                   BKE_node_instance_hash_free(bNodeInstanceHash *hash, bNodeInstanceValueFP valfreefp);
 void                   BKE_node_instance_hash_insert(bNodeInstanceHash *hash, bNodeInstanceKey key, void *value);
-void*                  BKE_node_instance_hash_lookup(bNodeInstanceHash *hash, bNodeInstanceKey key);
+void                  *BKE_node_instance_hash_lookup(bNodeInstanceHash *hash, bNodeInstanceKey key);
 int                    BKE_node_instance_hash_remove(bNodeInstanceHash *hash, bNodeInstanceKey key, bNodeInstanceValueFP valfreefp);
 void                   BKE_node_instance_hash_clear(bNodeInstanceHash *hash, bNodeInstanceValueFP valfreefp);
-void*                  BKE_node_instance_hash_pop(bNodeInstanceHash *hash, bNodeInstanceKey key);
+void                  *BKE_node_instance_hash_pop(bNodeInstanceHash *hash, bNodeInstanceKey key);
 int                    BKE_node_instance_hash_haskey(bNodeInstanceHash *hash, bNodeInstanceKey key);
 int                    BKE_node_instance_hash_size(bNodeInstanceHash *hash);
 
@@ -540,7 +540,7 @@ BLI_INLINE bNodeInstanceHashIterator *BKE_node_instance_hash_iterator_new(bNodeI
 BLI_INLINE void                       BKE_node_instance_hash_iterator_init(bNodeInstanceHashIterator *iter, bNodeInstanceHash *hash) { BLI_ghashIterator_init(iter, hash->ghash); }
 BLI_INLINE void                       BKE_node_instance_hash_iterator_free(bNodeInstanceHashIterator *iter) { BLI_ghashIterator_free(iter); }
 BLI_INLINE bNodeInstanceKey           BKE_node_instance_hash_iterator_get_key(bNodeInstanceHashIterator *iter) { return *(bNodeInstanceKey *)BLI_ghashIterator_getKey(iter); }
-BLI_INLINE void*                      BKE_node_instance_hash_iterator_get_value(bNodeInstanceHashIterator *iter) { return BLI_ghashIterator_getValue(iter); }
+BLI_INLINE void                      *BKE_node_instance_hash_iterator_get_value(bNodeInstanceHashIterator *iter) { return BLI_ghashIterator_getValue(iter); }
 BLI_INLINE void                       BKE_node_instance_hash_iterator_step(bNodeInstanceHashIterator *iter) { BLI_ghashIterator_step(iter); }
 BLI_INLINE bool                       BKE_node_instance_hash_iterator_not_done(bNodeInstanceHashIterator *iter) { return BLI_ghashIterator_notDone(iter); }
 
@@ -553,8 +553,8 @@ BLI_INLINE bool                       BKE_node_instance_hash_iterator_not_done(b
 /* Node Previews */
 
 int             BKE_node_preview_used(struct bNode *node);
-bNodePreview*   BKE_node_preview_verify(struct bNodeInstanceHash *previews, bNodeInstanceKey key, int xsize, int ysize, int create);
-bNodePreview*   BKE_node_preview_copy(struct bNodePreview *preview);
+bNodePreview   *BKE_node_preview_verify(struct bNodeInstanceHash *previews, bNodeInstanceKey key, int xsize, int ysize, int create);
+bNodePreview   *BKE_node_preview_copy(struct bNodePreview *preview);
 void            BKE_node_preview_free(struct bNodePreview *preview);
 void            BKE_node_preview_init_tree(struct bNodeTree *ntree, int xsize, int ysize, int create_previews);
 void            BKE_node_preview_free_tree(struct bNodeTree *ntree);
diff --git a/source/blender/blenkernel/BKE_texture.h b/source/blender/blenkernel/BKE_texture.h
index f1796373367..621fc13af67 100644
--- a/source/blender/blenkernel/BKE_texture.h
+++ b/source/blender/blenkernel/BKE_texture.h
@@ -61,8 +61,8 @@ struct World;
 
 void BKE_texture_free(struct Tex *t); 
 
-void init_colorband(struct ColorBand *coba, int rangetype);
-struct ColorBand *add_colorband(int rangetype);
+void init_colorband(struct ColorBand *coba, bool rangetype);
+struct ColorBand *add_colorband(bool rangetype);
 int do_colorband(const struct ColorBand *coba, float in, float out[4]);
 void colorband_table_RGBA(struct ColorBand *coba, float **array, int *size);
 struct CBData *colorband_element_add(struct ColorBand *coba, float position);
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index 4b05f1c1050..24fb949481f 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -1152,7 +1152,7 @@ int dynamicPaint_createType(struct DynamicPaintModifierData *pmd, int type, stru
 			{
 				CBData *ramp;
 
-				brush->paint_ramp = add_colorband(0);
+				brush->paint_ramp = add_colorband(false);
 				if (!brush->paint_ramp)
 					return 0;
 				ramp = brush->paint_ramp->data;
@@ -1168,7 +1168,7 @@ int dynamicPaint_createType(struct DynamicPaintModifierData *pmd, int type, stru
 			{
 				CBData *ramp;
 
-				brush->vel_ramp = add_colorband(0);
+				brush->vel_ramp = add_colorband(false);
 				if (!brush->vel_ramp)
 					return 0;
 				ramp = brush->vel_ramp->data;
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 355541557ea..4e79c086d4d 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -2171,7 +2171,7 @@ void BKE_image_walk_all_users(const Main *mainp, void *customdata,
 				}
 				else if (sa->spacetype == SPACE_NODE) {
 					SpaceNode *snode = sa->spacedata.first;
-					if (snode->nodetree && snode->nodetree->type==NTREE_COMPOSIT) {
+					if (snode->nodetree && snode->nodetree->type == NTREE_COMPOSIT) {
 						bNode *node;
 						for (node = snode->nodetree->nodes.first; node; node = node->next) {
 							if (node->id && node->type == CMP_NODE_IMAGE) {
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index 0b63c4d8842..94feaed022f 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -205,29 +205,29 @@ static void update_typeinfo(Main *bmain, const struct bContext *C, bNodeTreeType
 		
 		ntree->init |= NTREE_TYPE_INIT;
 		
-		if (treetype && strcmp(ntree->idname, treetype->idname)==0)
+		if (treetype && STREQ(ntree->idname, treetype->idname))
 			ntree_set_typeinfo(ntree, unregister ? NULL : treetype);
 		
 		/* initialize nodes */
-		for (node=ntree->nodes.first; node; node=node->next) {
-			if (nodetype && strcmp(node->idname, nodetype->idname)==0)
+		for (node = ntree->nodes.first; node; node = node->next) {
+			if (nodetype && STREQ(node->idname, nodetype->idname))
 				node_set_typeinfo(C, ntree, node, unregister ? NULL : nodetype);
 			
 			/* initialize node sockets */
-			for (sock=node->inputs.first; sock; sock=sock->next)
-				if (socktype && strcmp(sock->idname, socktype->idname)==0)
+			for (sock = node->inputs.first; sock; sock = sock->next)
+				if (socktype && STREQ(sock->idname, socktype->idname))
 					node_socket_set_typeinfo(ntree, sock, unregister ? NULL : socktype);
-			for (sock=node->outputs.first; sock; sock=sock->next)
-				if (socktype && strcmp(sock->idname, socktype->idname)==0)
+			for (sock = node->outputs.first; sock; sock = sock->next)
+				if (socktype && STREQ(sock->idname, socktype->idname))
 					node_socket_set_typeinfo(ntree, sock, unregister ? NULL : socktype);
 		}
 		
 		/* initialize tree sockets */
-		for (sock=ntree->inputs.first; sock; sock=sock->next)
-			if (socktype && strcmp(sock->idname, socktype->idname)==0)
+		for (sock = ntree->inputs.first; sock; sock = sock->next)
+			if (socktype && STREQ(sock->idname, socktype->idname))
 				node_socket_set_typeinfo(ntree, sock, unregister ? NULL : socktype);
-		for (sock=ntree->outputs.first; sock; sock=sock->next)
-			if (socktype && strcmp(sock->idname, socktype->idname)==0)
+		for (sock = ntree->outputs.first; sock; sock = sock->next)
+			if (socktype && STREQ(sock->idname, socktype->idname))
 				node_socket_set_typeinfo(ntree, sock, unregister ? NULL : socktype);
 	}
 	FOREACH_NODETREE_END
@@ -250,37 +250,37 @@ void ntreeSetTypes(const struct bContext *C, bNodeTree *ntree)
 	for (node = ntree->nodes.first; node; node = node->next) {
 		node_set_typeinfo(C, ntree, node, nodeTypeFind(node->idname));
 		
-		for (sock=node->inputs.first; sock; sock=sock->next)
+		for (sock = node->inputs.first; sock; sock = sock->next)
 			node_socket_set_typeinfo(ntree, sock, nodeSocketTypeFind(sock->idname));
-		for (sock=node->outputs.first; sock; sock=sock->next)
+		for (sock = node->outputs.first; sock; sock = sock->next)
 			node_socket_set_typeinfo(ntree, sock, nodeSocketTypeFind(sock->idname));
 	}
 	
-	for (sock=ntree->inputs.first; sock; sock=sock->next)
+	for (sock = ntree->inputs.first; sock; sock = sock->next)
 		node_socket_set_typeinfo(ntree, sock, nodeSocketTypeFind(sock->idname));
-	for (sock=ntree->outputs.first; sock; sock=sock->next)
+	for (sock = ntree->outputs.first; sock; sock = sock->next)
 		node_socket_set_typeinfo(ntree, sock, nodeSocketTypeFind(sock->idname));
 }
 
 
-static GHash *nodetreetypes_hash= NULL;
-static GHash *nodetypes_hash= NULL;
-static GHash *nodesockettypes_hash= NULL;
+static GHash *nodetreetypes_hash = NULL;
+static GHash *nodetypes_hash = NULL;
+static GHash *nodesockettypes_hash = NULL;
 
 bNodeTreeType *ntreeTypeFind(const char *idname)
 {
-	bNodeTreeType* nt;
+	bNodeTreeType *nt;
 
 	if (idname[0]) {
-		nt= BLI_ghash_lookup(nodetreetypes_hash, idname);
-		if(nt)
+		nt = BLI_ghash_lookup(nodetreetypes_hash, idname);
+		if (nt)
 			return nt;
 	}
 
 	return NULL;
 }
 
-void ntreeTypeAdd(bNodeTreeType* nt)
+void ntreeTypeAdd(bNodeTreeType *nt)
 {
 	BLI_ghash_insert(nodetreetypes_hash, (void *)nt->idname, nt);
 	/* XXX pass Main to register function? */
@@ -296,12 +296,12 @@ static void ntree_free_type(void *treetype_v)
 	MEM_freeN(treetype);
 }
 
-void ntreeTypeFreeLink(bNodeTreeType* nt)
+void ntreeTypeFreeLink(bNodeTreeType *nt)
 {
 	BLI_ghash_remove(nodetreetypes_hash, nt->idname, NULL, ntree_free_type);
 }
 
-GHashIterator *ntreeTypeGetIterator()
+GHashIterator *ntreeTypeGetIterator(void)
 {
 	return BLI_ghashIterator_new(nodetreetypes_hash);
 }
@@ -313,11 +313,11 @@ int ntreeIsValid(bNodeTree *ntree)
 
 bNodeType *nodeTypeFind(const char *idname)
 {
-	bNodeType* nt;
+	bNodeType *nt;
 
 	if (idname[0]) {
-		nt= BLI_ghash_lookup(nodetypes_hash, idname);
-		if(nt)
+		nt = BLI_ghash_lookup(nodetypes_hash, idname);
+		if (nt)
 			return nt;
 	}
 
@@ -326,14 +326,14 @@ bNodeType *nodeTypeFind(const char *idname)
 
 static void free_dynamic_typeinfo(bNodeType *ntype)
 {
-	if(ntype->type==NODE_DYNAMIC) {
-		if(ntype->inputs) {
+	if (ntype->type == NODE_DYNAMIC) {
+		if (ntype->inputs) {
 			MEM_freeN(ntype->inputs);
 		}
-		if(ntype->outputs) {
+		if (ntype->outputs) {
 			MEM_freeN(ntype->outputs);
 		}
-		if(ntype->ui_name) {
+		if (ntype->ui_name) {
 			MEM_freeN((void *)ntype->ui_name);
 		}
 	}
@@ -347,7 +347,7 @@ static void node_free_type(void *nodetype_v)
 	update_typeinfo(G.main, NULL, NULL, nodetype, NULL, true);
 	
 	/* XXX deprecated */
-	if (nodetype->type==NODE_DYNAMIC)
+	if (nodetype->type == NODE_DYNAMIC)
 		free_dynamic_typeinfo(nodetype);
 	
 	if (nodetype->needs_free)
@@ -365,23 +365,23 @@ void nodeRegisterType(bNodeType *nt)
 	update_typeinfo(G.main, NULL, NULL, nt, NULL, false);
 }
 
-void nodeUnregisterType(bNodeType* nt)
+void nodeUnregisterType(bNodeType *nt)
 {
 	BLI_ghash_remove(nodetypes_hash, nt->idname, NULL, node_free_type);
 }
 
-GHashIterator *nodeTypeGetIterator()
+GHashIterator *nodeTypeGetIterator(void)
 {
 	return BLI_ghashIterator_new(nodetypes_hash);
 }
 
 bNodeSocketType *nodeSocketTypeFind(const char *idname)
 {
-	bNodeSocketType* st;
+	bNodeSocketType *st;
 
 	if (idname[0]) {
-		st= BLI_ghash_lookup(nodesockettypes_hash, idname);
-		if(st)
+		st = BLI_ghash_lookup(nodesockettypes_hash, idname);
+		if (st)
 			return st;
 	}
 
@@ -398,14 +398,14 @@ static void node_free_socket_type(void *socktype_v)
 	MEM_freeN(socktype);
 }
 
-void nodeRegisterSocketType(bNodeSocketType* st)
+void nodeRegisterSocketType(bNodeSocketType *st)
 {
 	BLI_ghash_insert(nodesockettypes_hash, (void *)st->idname, st);
 	/* XXX pass Main to register function? */
 	update_typeinfo(G.main, NULL, NULL, NULL, st, false);
 }
 
-void nodeUnregisterSocketType(bNodeSocketType* st)
+void nodeUnregisterSocketType(bNodeSocketType *st)
 {
 	BLI_ghash_remove(nodesockettypes_hash, st->idname, NULL, node_free_socket_type);
 }
@@ -419,20 +419,20 @@ void nodeMakeDynamicType(bNode *UNUSED(node))
 {
 	#if 0	/* XXX deprecated */
 	/* find SH_DYNAMIC_NODE ntype */
-	bNodeType *ntype= ntreeType_Shader->node_types.first;
-	while(ntype) {
-		if(ntype->type==NODE_DYNAMIC)
+	bNodeType *ntype = ntreeType_Shader->node_types.first;
+	while (ntype) {
+		if (ntype->type == NODE_DYNAMIC)
 			break;
-		ntype= ntype->next;
+		ntype = ntype->next;
 	}
 
 	/* make own type struct to fill */
-	if(ntype) {
+	if (ntype) {
 		/*node->typeinfo= MEM_dupallocN(ntype);*/
-		bNodeType *newtype= MEM_callocN(sizeof(bNodeType), "dynamic bNodeType");
-		*newtype= *ntype;
+		bNodeType *newtype = MEM_callocN(sizeof(bNodeType), "dynamic bNodeType");
+		*newtype = *ntype;
 		BLI_strncpy(newtype->name, ntype->name, sizeof(newtype->name));
-		node->typeinfo= newtype;
+		node->typeinfo = newtype;
 	}
 	#endif
 }
@@ -440,8 +440,8 @@ void nodeMakeDynamicType(bNode *UNUSED(node))
 struct bNodeSocket *nodeFindSocket(bNode *node, int in_out, const char *identifier)
 {
 	bNodeSocket *sock = (in_out == SOCK_IN ? node->inputs.first : node->outputs.first);
-	for (; sock; sock=sock->next) {
-		if (strcmp(sock->identifier, identifier)==0)
+	for (; sock; sock = sock->next) {
+		if (STREQ(sock->identifier, identifier))
 			return sock;
 	}
 	return NULL;
@@ -453,7 +453,7 @@ static bool unique_identifier_check(void *arg, const char *identifier)
 	struct ListBase *lb = arg;
 	bNodeSocket *sock;
 	for (sock = lb->first; sock; sock = sock->next) {
-		if (strcmp(sock->identifier, identifier)==0)
+		if (STREQ(sock->identifier, identifier))
 			return true;
 	}
 	return false;
@@ -792,10 +792,10 @@ bNode *nodeAddNode(const struct bContext *C, bNodeTree *ntree, const char *idnam
 
 bNode *nodeAddStaticNode(const struct bContext *C, bNodeTree *ntree, int type)
 {
-	const char *idname=NULL;
+	const char *idname = NULL;
 	
 	NODE_TYPES_BEGIN(ntype)
-		if(ntype->type==type) {
+		if (ntype->type == type) {
 			idname = ntype->idname;
 			break;
 		}
@@ -1075,7 +1075,7 @@ bNodeTree *ntreeAddTree(Main *bmain, const char *name, const char *idname)
 	 * node groups and other tree types are created as library data.
 	 */
 	if (bmain) {
-		ntree= BKE_libblock_alloc(&bmain->nodetree, ID_NT, name);
+		ntree = BKE_libblock_alloc(&bmain->nodetree, ID_NT, name);
 	}
 	else {
 		ntree = MEM_callocN(sizeof(bNodeTree), "new node tree");
@@ -1593,7 +1593,7 @@ void nodeFreeNode(bNodeTree *ntree, bNode *node)
 			ntree->execdata = NULL;
 		}
 		
-		if(node->typeinfo && node->typeinfo->freefunc)
+		if (node->typeinfo && node->typeinfo->freefunc)
 			node->typeinfo->freefunc(node);
 	}
 	
@@ -1987,7 +1987,7 @@ static bNodeSocket *make_socket_template(bNodeTree *ntree, int in_out,
 	}
 	
 	sock = MEM_callocN(sizeof(bNodeSocket), "socket template");
-	sock->typeinfo= stype;
+	sock->typeinfo = stype;
 	BLI_strncpy(sock->idname, stype->idname, sizeof(sock->idname));
 	sock->in_out = in_out;
 	sock->type = SOCK_CUSTOM;	/* int type undefined by default */
@@ -2021,7 +2021,7 @@ bNodeSocket *ntreeFindSocketInterface(bNodeTree *ntree, int in_out, const char *
 {
 	bNodeSocket *iosock = (in_out == SOCK_IN ? ntree->inputs.first : ntree->outputs.first);
 	for (; iosock; iosock = iosock->next)
-		if (strcmp(iosock->identifier, identifier)==0)
+		if (STREQ(iosock->identifier, identifier))
 			return iosock;
 	return NULL;
 }
@@ -2097,7 +2097,7 @@ void ntreeRemoveSocketInterface(bNodeTree *ntree, bNodeSocket *sock)
 static void ntree_interface_identifier_base(bNodeTree *ntree, char *base)
 {
 	/* generate a valid RNA identifier */
-	sprintf(base, "NodeTreeInterface_%s", ntree->id.name+2);
+	sprintf(base, "NodeTreeInterface_%s", ntree->id.name + 2);
 	RNA_identifier_sanitize(base, FALSE);
 }
 
@@ -2117,8 +2117,8 @@ static void ntree_interface_identifier(bNodeTree *ntree, const char *base, char
 	identifier[0] = '\0';
 	BLI_uniquename_cb(ntree_interface_unique_identifier_check, NULL, base, '_', identifier, maxlen);
 	
-	sprintf(name, "Node Tree %s Interface", ntree->id.name+2);
-	sprintf(description, "Interface properties of node group %s", ntree->id.name+2);
+	sprintf(name, "Node Tree %s Interface", ntree->id.name + 2);
+	sprintf(description, "Interface properties of node group %s", ntree->id.name + 2);
 }
 
 static void ntree_interface_type_create(bNodeTree *ntree)
@@ -2126,7 +2126,7 @@ static void ntree_interface_type_create(bNodeTree *ntree)
 	StructRNA *srna;
 	bNodeSocket *sock;
 	/* strings are generated from base string + ID name, sizes are sufficient */
-	char base[MAX_ID_NAME+64], identifier[MAX_ID_NAME+64], name[MAX_ID_NAME+64], description[MAX_ID_NAME+64];
+	char base[MAX_ID_NAME + 64], identifier[MAX_ID_NAME + 64], name[MAX_ID_NAME + 64], description[MAX_ID_NAME + 64];
 	
 	/* generate a valid RNA identifier */
 	ntree_interface_identifier_base(ntree, base);
@@ -2158,7 +2158,7 @@ StructRNA *ntreeInterfaceTypeGet(bNodeTree *ntree, int create)
 {
 	if (ntree->interface_type) {
 		/* strings are generated from base string + ID name, sizes are sufficient */
-		char base[MAX_ID_NAME+64], identifier[MAX_ID_NAME+64], name[MAX_ID_NAME+64], description[MAX_ID_NAME+64];
+		char base[MAX_ID_NAME + 64], identifier[MAX_ID_NAME + 64], name[MAX_ID_NAME + 64], description[MAX_ID_NAME + 64];
 		
 		/* A bit of a hack: when changing the ID name, update the RNA type identifier too,
 		 * so that the names match. This is not strictly necessary to keep it working,
@@ -2270,9 +2270,9 @@ bNode *nodeGetActiveID(bNodeTree *ntree, short idtype)
 				return node;
 	
 	/* no node with active ID in this tree, look inside groups */
-	for(node= ntree->nodes.first; node; node= node->next) {
-		if(node->type==NODE_GROUP) {
-			tnode = nodeGetActiveID((bNodeTree*)node->id, idtype);
+	for (node = ntree->nodes.first; node; node = node->next) {
+		if (node->type == NODE_GROUP) {
+			tnode = nodeGetActiveID((bNodeTree *)node->id, idtype);
 			if (tnode)
 				return tnode;
 		}
@@ -2281,10 +2281,10 @@ bNode *nodeGetActiveID(bNodeTree *ntree, short idtype)
 	return NULL;
 }
 
-int nodeSetActiveID(bNodeTree *ntree, short idtype, ID *id)
+bool nodeSetActiveID(bNodeTree *ntree, short idtype, ID *id)
 {
 	bNode *node;
-	int ok = FALSE;
+	bool ok = false;
 
 	if (ntree == NULL) return ok;
 
@@ -2304,9 +2304,9 @@ int nodeSetActiveID(bNodeTree *ntree, short idtype, ID *id)
 	 * if active ID node has been found already,
 	 * just pass NULL so other matching nodes are deactivated.
 	 */
-	for(node= ntree->nodes.first; node; node= node->next) {
-		if(node->type==NODE_GROUP)
-			ok |= nodeSetActiveID((bNodeTree*)node->id, idtype, (ok==FALSE ? id : NULL));
+	for (node = ntree->nodes.first; node; node = node->next) {
+		if (node->type == NODE_GROUP)
+			ok |= nodeSetActiveID((bNodeTree *)node->id, idtype, (ok == false ? id : NULL));
 	}
 
 	return ok;
@@ -2336,9 +2336,9 @@ void nodeSetSelected(bNode *node, int select)
 		node->flag &= ~NODE_SELECT;
 		
 		/* deselect sockets too */
-		for (sock=node->inputs.first; sock; sock=sock->next)
+		for (sock = node->inputs.first; sock; sock = sock->next)
 			sock->flag &= ~NODE_SELECT;
-		for (sock=node->outputs.first; sock; sock=sock->next)
+		for (sock = node->outputs.first; sock; sock = sock->next)
 			sock->flag &= ~NODE_SELECT;
 	}
 }
@@ -2563,7 +2563,7 @@ bNodeInstanceKey BKE_node_instance_key(bNodeInstanceKey parent_key, bNodeTree *n
 {
 	bNodeInstanceKey key;
 	
-	key = node_hash_int_str(parent_key, ntree->id.name+2);
+	key = node_hash_int_str(parent_key, ntree->id.name + 2);
 	
 	if (node)
 		key = node_hash_int_str(key, node->name);
@@ -2673,7 +2673,7 @@ void BKE_node_instance_hash_remove_untagged(bNodeInstanceHash *hash, bNodeInstan
 	/* NOTE: Hash must not be mutated during iterating!
 	 * Store tagged entries in a separate list and remove items afterward.
 	 */
-	bNodeInstanceKey *untagged = MEM_mallocN(sizeof(bNodeInstanceKey)*BKE_node_instance_hash_size(hash), "temporary node instance key list");
+	bNodeInstanceKey *untagged = MEM_mallocN(sizeof(bNodeInstanceKey) * BKE_node_instance_hash_size(hash), "temporary node instance key list");
 	bNodeInstanceHashIterator iter;
 	int num_untagged, i;
 	
@@ -2922,7 +2922,7 @@ int nodeUpdateID(bNodeTree *ntree, ID *id)
 	ntree->is_updating = TRUE;
 	
 	for (node = ntree->nodes.first; node; node = node->next) {
-		if(node->id == id) {
+		if (node->id == id) {
 			change = TRUE;
 			node->update |= NODE_UPDATE_ID;
 			if (node->typeinfo->updatefunc)
@@ -2952,15 +2952,15 @@ void nodeUpdateInternalLinks(bNodeTree *ntree, bNode *node)
 /* nodes that use ID data get synced with local data */
 void nodeSynchronizeID(bNode *node, bool copy_to_id)
 {
-	if (node->id==NULL) return;
+	if (node->id == NULL) return;
 	
 	if (ELEM(node->type, SH_NODE_MATERIAL, SH_NODE_MATERIAL_EXT)) {
 		bNodeSocket *sock;
-		Material *ma= (Material *)node->id;
+		Material *ma = (Material *)node->id;
 		int a;
 		
 		/* hrmf, case in loop isn't super fast, but we don't edit 100s of material at same time either! */
-		for (a=0, sock= node->inputs.first; sock; sock= sock->next, a++) {
+		for (a = 0, sock = node->inputs.first; sock; sock = sock->next, a++) {
 			if (!nodeSocketIsHidden(sock)) {
 				if (copy_to_id) {
 					switch (a) {
@@ -2969,7 +2969,7 @@ void nodeSynchronizeID(bNode *node, bool copy_to_id)
 						case MAT_IN_SPEC:
 							copy_v3_v3(&ma->specr, ((bNodeSocketValueRGBA *)sock->default_value)->value); break;
 						case MAT_IN_REFL:
-							ma->ref= ((bNodeSocketValueFloat *)sock->default_value)->value; break;
+							ma->ref = ((bNodeSocketValueFloat *)sock->default_value)->value; break;
 						case MAT_IN_MIR:
 							copy_v3_v3(&ma->mirr, ((bNodeSocketValueRGBA *)sock->default_value)->value); break;
 						case MAT_IN_AMB:
@@ -2993,7 +2993,7 @@ void nodeSynchronizeID(bNode *node, bool copy_to_id)
 						case MAT_IN_SPEC:
 							copy_v3_v3(((bNodeSocketValueRGBA *)sock->default_value)->value, &ma->specr); break;
 						case MAT_IN_REFL:
-							((bNodeSocketValueFloat *)sock->default_value)->value= ma->ref; break;
+							((bNodeSocketValueFloat *)sock->default_value)->value = ma->ref; break;
 						case MAT_IN_MIR:
 							copy_v3_v3(((bNodeSocketValueRGBA *)sock->default_value)->value, &ma->mirr); break;
 						case MAT_IN_AMB:
@@ -3098,11 +3098,11 @@ void node_type_base_custom(bNodeType *ntype, const char *idname, const char *nam
 static bool unique_socket_template_identifier_check(void *arg, const char *name)
 {
 	bNodeSocketTemplate *ntemp;
-	struct {bNodeSocketTemplate *list; bNodeSocketTemplate *ntemp;} *data= arg;
+	struct {bNodeSocketTemplate *list; bNodeSocketTemplate *ntemp;} *data = arg;
 	
 	for (ntemp = data->list; ntemp->type >= 0; ++ntemp) {
 		if (ntemp != data->ntemp) {
-			if (!strcmp(ntemp->identifier, name)) {
+			if (STREQ(ntemp->identifier, name)) {
 				return true;
 			}
 		}
@@ -3114,7 +3114,7 @@ static bool unique_socket_template_identifier_check(void *arg, const char *name)
 static void unique_socket_template_identifier(bNodeSocketTemplate *list, bNodeSocketTemplate *ntemp, const char defname[], char delim)
 {
 	struct {bNodeSocketTemplate *list; bNodeSocketTemplate *ntemp;} data;
-	data.list= list;
+	data.list = list;
 	data.ntemp = ntemp;
 
 	BLI_uniquename_cb(unique_socket_template_identifier_check, &data, defname, delim, ntemp->identifier, sizeof(ntemp->identifier));
@@ -3130,20 +3130,20 @@ void node_type_socket_templates(struct bNodeType *ntype, struct bNodeSocketTempl
 	/* automatically generate unique identifiers */
 	if (inputs) {
 		/* clear identifier strings (uninitialized memory) */
-		for (ntemp=inputs; ntemp->type >= 0; ++ntemp)
+		for (ntemp = inputs; ntemp->type >= 0; ++ntemp)
 			ntemp->identifier[0] = '\0';
 		
-		for (ntemp=inputs; ntemp->type >= 0; ++ntemp) {
+		for (ntemp = inputs; ntemp->type >= 0; ++ntemp) {
 			BLI_strncpy(ntemp->identifier, ntemp->name, sizeof(ntemp->identifier));
 			unique_socket_template_identifier(inputs, ntemp, ntemp->identifier, '_');
 		}
 	}
 	if (outputs) {
 		/* clear identifier strings (uninitialized memory) */
-		for (ntemp=outputs; ntemp->type >= 0; ++ntemp)
+		for (ntemp = outputs; ntemp->type >= 0; ++ntemp)
 			ntemp->identifier[0] = '\0';
 		
-		for (ntemp=outputs; ntemp->type >= 0; ++ntemp) {
+		for (ntemp = outputs; ntemp->type >= 0; ++ntemp) {
 			BLI_strncpy(ntemp->identifier, ntemp->name, sizeof(ntemp->identifier));
 			unique_socket_template_identifier(outputs, ntemp, ntemp->identifier, '_');
 		}
@@ -3472,20 +3472,20 @@ void init_nodesystem(void)
 void free_nodesystem(void) 
 {
 	NODE_TYPES_BEGIN(nt)
-		if(nt->ext.free) {
+		if (nt->ext.free) {
 			nt->ext.free(nt->ext.data);
 		}
 	NODE_TYPES_END
 	
 	NODE_SOCKET_TYPES_BEGIN(st)
-		if(st->ext_socket.free)
+		if (st->ext_socket.free)
 			st->ext_socket.free(st->ext_socket.data);
-		if(st->ext_interface.free)
+		if (st->ext_interface.free)
 			st->ext_interface.free(st->ext_interface.data);
 	NODE_SOCKET_TYPES_END
 	
 	NODE_TREE_TYPES_BEGIN(nt)
-		if(nt->ext.free) {
+		if (nt->ext.free) {
 			nt->ext.free(nt->ext.data);
 		}
 	NODE_TREE_TYPES_END
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index c900d08e4e9..968e9fe3206 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -1362,7 +1362,7 @@ static int ptcache_filename(PTCacheID *pid, char *filename, int cfra, short do_p
 		newname += len;
 	}
 	if (pid->cache->name[0] == '\0' && (pid->cache->flag & PTCACHE_EXTERNAL)==0) {
-		idname = (pid->ob->id.name+2);
+		idname = (pid->ob->id.name + 2);
 		/* convert chars to hex so they are always a valid filename */
 		while ('\0' != *idname) {
 			BLI_snprintf(newname, MAX_PTCACHE_FILE, "%02X", (char)(*idname++));
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index c6d4cf1412d..2517324242b 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -148,7 +148,7 @@ void default_color_mapping(ColorMapping *colormap)
 {
 	memset(colormap, 0, sizeof(ColorMapping));
 
-	init_colorband(&colormap->coba, 1);
+	init_colorband(&colormap->coba, true);
 
 	colormap->bright = 1.0;
 	colormap->contrast = 1.0;
@@ -163,7 +163,7 @@ void default_color_mapping(ColorMapping *colormap)
 
 /* ****************** COLORBAND ******************* */
 
-void init_colorband(ColorBand *coba, int rangetype)
+void init_colorband(ColorBand *coba, bool rangetype)
 {
 	int a;
 	
@@ -205,7 +205,7 @@ void init_colorband(ColorBand *coba, int rangetype)
 	
 }
 
-ColorBand *add_colorband(int rangetype)
+ColorBand *add_colorband(bool rangetype)
 {
 	ColorBand *coba;
 	
@@ -1285,7 +1285,7 @@ PointDensity *BKE_add_pointdensity(void)
 	pd->noise_depth = 1;
 	pd->noise_fac = 1.0f;
 	pd->noise_influence = TEX_PD_NOISE_STATIC;
-	pd->coba = add_colorband(1);
+	pd->coba = add_colorband(true);
 	pd->speed_scale = 1.0f;
 	pd->totpoints = 0;
 	pd->object = NULL;
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index ea5610af3b5..fdd34eb2475 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -1401,7 +1401,7 @@ void blo_make_movieclip_pointer_map(FileData *fd, Main *oldmain)
 	for (; sce; sce = sce->id.next) {
 		if (sce->nodetree) {
 			bNode *node;
-			for (node = sce->nodetree->nodes.first; node; node= node->next)
+			for (node = sce->nodetree->nodes.first; node; node = node->next)
 				if (node->type == CMP_NODE_MOVIEDISTORTION)
 					oldnewmap_insert(fd->movieclipmap, node->storage, node->storage, 0);
 		}
@@ -2332,15 +2332,15 @@ static void lib_link_ntree(FileData *fd, ID *id, bNodeTree *ntree)
 		
 		node->id= newlibadr_us(fd, id->lib, node->id);
 
-		for (sock=node->inputs.first; sock; sock=sock->next)
+		for (sock = node->inputs.first; sock; sock = sock->next)
 			lib_link_node_socket(fd, id, sock);
-		for (sock=node->outputs.first; sock; sock=sock->next)
+		for (sock = node->outputs.first; sock; sock = sock->next)
 			lib_link_node_socket(fd, id, sock);
 	}
 	
-	for (sock=ntree->inputs.first; sock; sock=sock->next)
+	for (sock = ntree->inputs.first; sock; sock = sock->next)
 		lib_link_node_socket(fd, id, sock);
-	for (sock=ntree->outputs.first; sock; sock=sock->next)
+	for (sock = ntree->outputs.first; sock; sock = sock->next)
 		lib_link_node_socket(fd, id, sock);
 }
 
@@ -2367,7 +2367,7 @@ static void lib_node_do_versions_group_indices(bNode *gnode)
 	bNodeSocket *sock;
 	bNodeLink *link;
 	
-	for (sock=gnode->outputs.first; sock; sock=sock->next) {
+	for (sock=gnode->outputs.first; sock; sock = sock->next) {
 		int old_index = sock->to_index;
 		
 		for (link = ngroup->links.first; link; link = link->next) {
@@ -2380,7 +2380,7 @@ static void lib_node_do_versions_group_indices(bNode *gnode)
 			}
 		}
 	}
-	for (sock=gnode->inputs.first; sock; sock=sock->next) {
+	for (sock=gnode->inputs.first; sock; sock = sock->next) {
 		int old_index = sock->to_index;
 		
 		for (link = ngroup->links.first; link; link = link->next) {
@@ -4245,9 +4245,9 @@ static void lib_link_object(FileData *fd, Main *main)
 					ob->proxy = NULL;
 					
 					if (ob->id.lib)
-						printf("Proxy lost from  object %s lib %s\n", ob->id.name+2, ob->id.lib->name);
+						printf("Proxy lost from  object %s lib %s\n", ob->id.name + 2, ob->id.lib->name);
 					else
-						printf("Proxy lost from  object %s lib <NONE>\n", ob->id.name+2);
+						printf("Proxy lost from  object %s lib <NONE>\n", ob->id.name + 2);
 				}
 				else {
 					/* this triggers object_update to always use a copy */
@@ -4261,9 +4261,9 @@ static void lib_link_object(FileData *fd, Main *main)
 			
 			if (ob->data==NULL && poin!=NULL) {
 				if (ob->id.lib)
-					printf("Can't find obdata of %s lib %s\n", ob->id.name+2, ob->id.lib->name);
+					printf("Can't find obdata of %s lib %s\n", ob->id.name + 2, ob->id.lib->name);
 				else
-					printf("Object %s lost data.\n", ob->id.name+2);
+					printf("Object %s lost data.\n", ob->id.name + 2);
 				
 				ob->type = OB_EMPTY;
 				warn = 1;
@@ -4984,7 +4984,7 @@ static void composite_patch(bNodeTree *ntree, Scene *scene)
 {
 	bNode *node;
 	
-	for (node= ntree->nodes.first; node; node= node->next) {
+	for (node = ntree->nodes.first; node; node = node->next) {
 		if (node->id==NULL && ELEM4(node->type, CMP_NODE_R_LAYERS, CMP_NODE_COMPOSITE, CMP_NODE_DEFOCUS, CMP_NODE_OUTPUT_FILE))
 			node->id = &scene->id;
 	}
@@ -5681,7 +5681,7 @@ static void lib_link_screen(FileData *fd, Main *main)
 
 static bool restore_pointer(ID *id, ID *newid, int user)
 {
-	if (strcmp(newid->name+2, id->name+2) == 0) {
+	if (strcmp(newid->name + 2, id->name + 2) == 0) {
 		if (newid->lib == id->lib) {
 			if (user == 1) {
 				if (newid->us == 0) {
@@ -7238,7 +7238,7 @@ static void do_versions_nodetree_multi_file_output_format_2_62_1(Scene *sce, bNo
 				nimf->format = sce->r.im_format;
 			
 			/* transfer render format toggle to node format toggle */
-			for (sock=node->inputs.first; sock; sock=sock->next) {
+			for (sock = node->inputs.first; sock; sock = sock->next) {
 				NodeImageMultiFileSocket *simf = sock->storage;
 				simf->use_node_format = simf->use_render_format;
 			}
@@ -7292,7 +7292,7 @@ static void do_versions_nodetree_file_output_layers_2_64_5(bNodeTree *ntree)
 	for (node=ntree->nodes.first; node; node=node->next) {
 		if (node->type == CMP_NODE_OUTPUT_FILE) {
 			bNodeSocket *sock;
-			for (sock=node->inputs.first; sock; sock=sock->next) {
+			for (sock = node->inputs.first; sock; sock = sock->next) {
 				NodeImageMultiFileSocket *input = sock->storage;
 				
 				/* multilayer names are stored as separate strings now,
@@ -7487,15 +7487,15 @@ static void do_versions_nodetree_customnodes(bNodeTree *ntree, int UNUSED(is_gro
 			node->flag |= NODE_INIT;
 			
 			/* sockets idname */
-			for (sock=node->inputs.first; sock; sock=sock->next)
+			for (sock = node->inputs.first; sock; sock = sock->next)
 				BLI_strncpy(sock->idname, node_socket_get_static_idname(sock), sizeof(sock->idname));
-			for (sock=node->outputs.first; sock; sock=sock->next)
+			for (sock = node->outputs.first; sock; sock = sock->next)
 				BLI_strncpy(sock->idname, node_socket_get_static_idname(sock), sizeof(sock->idname));
 		}
 		/* tree sockets idname */
-		for (sock=ntree->inputs.first; sock; sock=sock->next)
+		for (sock = ntree->inputs.first; sock; sock = sock->next)
 			BLI_strncpy(sock->idname, node_socket_get_static_idname(sock), sizeof(sock->idname));
-		for (sock=ntree->outputs.first; sock; sock=sock->next)
+		for (sock = ntree->outputs.first; sock; sock = sock->next)
 			BLI_strncpy(sock->idname, node_socket_get_static_idname(sock), sizeof(sock->idname));
 	}
 	
@@ -7505,14 +7505,14 @@ static void do_versions_nodetree_customnodes(bNodeTree *ntree, int UNUSED(is_gro
 		bNodeSocket *sock;
 		
 		for (node=ntree->nodes.first; node; node=node->next) {
-			for (sock=node->inputs.first; sock; sock=sock->next)
+			for (sock = node->inputs.first; sock; sock = sock->next)
 				sock->in_out = SOCK_IN;
-			for (sock=node->outputs.first; sock; sock=sock->next)
+			for (sock = node->outputs.first; sock; sock = sock->next)
 				sock->in_out = SOCK_OUT;
 		}
-		for (sock=ntree->inputs.first; sock; sock=sock->next)
+		for (sock = ntree->inputs.first; sock; sock = sock->next)
 			sock->in_out = SOCK_IN;
-		for (sock=ntree->outputs.first; sock; sock=sock->next)
+		for (sock = ntree->outputs.first; sock; sock = sock->next)
 			sock->in_out = SOCK_OUT;
 	}
 	
@@ -7522,20 +7522,20 @@ static void do_versions_nodetree_customnodes(bNodeTree *ntree, int UNUSED(is_gro
 		bNodeSocket *sock;
 		
 		for (node=ntree->nodes.first; node; node=node->next) {
-			for (sock=node->inputs.first; sock; sock=sock->next) {
+			for (sock = node->inputs.first; sock; sock = sock->next) {
 				BLI_strncpy(sock->identifier, sock->name, sizeof(sock->identifier));
 				BLI_uniquename(&node->inputs, sock, sock->identifier, '.', offsetof(bNodeSocket, identifier), sizeof(sock->identifier));
 			}
-			for (sock=node->outputs.first; sock; sock=sock->next) {
+			for (sock = node->outputs.first; sock; sock = sock->next) {
 				BLI_strncpy(sock->identifier, sock->name, sizeof(sock->identifier));
 				BLI_uniquename(&node->outputs, sock, sock->identifier, '.', offsetof(bNodeSocket, identifier), sizeof(sock->identifier));
 			}
 		}
-		for (sock=ntree->inputs.first; sock; sock=sock->next) {
+		for (sock = ntree->inputs.first; sock; sock = sock->next) {
 			BLI_strncpy(sock->identifier, sock->name, sizeof(sock->identifier));
 			BLI_uniquename(&ntree->inputs, sock, sock->identifier, '.', offsetof(bNodeSocket, identifier), sizeof(sock->identifier));
 		}
-		for (sock=ntree->outputs.first; sock; sock=sock->next) {
+		for (sock = ntree->outputs.first; sock; sock = sock->next) {
 			BLI_strncpy(sock->identifier, sock->name, sizeof(sock->identifier));
 			BLI_uniquename(&ntree->outputs, sock, sock->identifier, '.', offsetof(bNodeSocket, identifier), sizeof(sock->identifier));
 		}
@@ -8980,7 +8980,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 			for (sa= sc->areabase.first; sa; sa= sa->next) {
 				SpaceLink *sl;
 				for (sl= sa->spacedata.first; sl; sl= sl->next) {
-					if(sl->spacetype==SPACE_NODE) {
+					if (sl->spacetype==SPACE_NODE) {
 						SpaceNode *snode = (SpaceNode *)sl;
 						
 						/* reset pointers to force tree path update from context */
@@ -10331,7 +10331,7 @@ static void give_base_to_groups(Main *mainvar, Scene *scene)
 			Base *base;
 			
 			/* BKE_object_add(...) messes with the selection */
-			Object *ob = BKE_object_add_only_object(mainvar, OB_EMPTY, group->id.name+2);
+			Object *ob = BKE_object_add_only_object(mainvar, OB_EMPTY, group->id.name + 2);
 			ob->type = OB_EMPTY;
 			ob->lay = scene->lay;
 			
@@ -10345,7 +10345,7 @@ static void give_base_to_groups(Main *mainvar, Scene *scene)
 			/* assign the group */
 			ob->dup_group = group;
 			ob->transflag |= OB_DUPLIGROUP;
-			rename_id(&ob->id, group->id.name+2);
+			rename_id(&ob->id, group->id.name + 2);
 			copy_v3_v3(ob->loc, scene->cursor);
 		}
 	}
@@ -10733,7 +10733,7 @@ static void read_libraries(FileData *basefd, ListBase *mainlist)
 									BKE_reportf_wrap(fd->reports, RPT_WARNING,
 									                 TIP_("LIB ERROR: %s: '%s' missing from '%s'"),
 									                 BKE_idcode_to_name(GS(id->name)),
-									                 id->name+2, mainptr->curlib->filepath);
+									                 id->name + 2, mainptr->curlib->filepath);
 								}
 								
 								change_idid_adr(mainlist, basefd, id, realid);
diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c
index f92a8678300..3827a31ae95 100644
--- a/source/blender/blenloader/intern/versioning_250.c
+++ b/source/blender/blenloader/intern/versioning_250.c
@@ -747,14 +747,14 @@ static void do_versions_nodetree_default_value_259(bNodeTree *ntree)
 	bNode *node;
 	bNodeSocket *sock;
 	for (node=ntree->nodes.first; node; node=node->next) {
-		for (sock=node->inputs.first; sock; sock=sock->next)
+		for (sock = node->inputs.first; sock; sock = sock->next)
 			do_versions_socket_default_value_259(sock);
-		for (sock=node->outputs.first; sock; sock=sock->next)
+		for (sock = node->outputs.first; sock; sock = sock->next)
 			do_versions_socket_default_value_259(sock);
 	}
-	for (sock=ntree->inputs.first; sock; sock=sock->next)
+	for (sock = ntree->inputs.first; sock; sock = sock->next)
 		do_versions_socket_default_value_259(sock);
-	for (sock=ntree->outputs.first; sock; sock=sock->next)
+	for (sock = ntree->outputs.first; sock; sock = sock->next)
 		do_versions_socket_default_value_259(sock);
 }
 
@@ -2378,17 +2378,17 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *main)
 			
 			/* first make sure the own_index for new sockets is valid */
 			for (node=ntree->nodes.first; node; node=node->next) {
-				for (sock=node->inputs.first; sock; sock=sock->next)
+				for (sock = node->inputs.first; sock; sock = sock->next)
 					if (sock->own_index >= ntree->cur_index)
 						ntree->cur_index = sock->own_index+1;
-				for (sock=node->outputs.first; sock; sock=sock->next)
+				for (sock = node->outputs.first; sock; sock = sock->next)
 					if (sock->own_index >= ntree->cur_index)
 						ntree->cur_index = sock->own_index+1;
 			}
 			
 			/* add ntree->inputs/ntree->outputs sockets for all unlinked sockets in the group tree. */
 			for (node=ntree->nodes.first; node; node=node->next) {
-				for (sock=node->inputs.first; sock; sock=sock->next) {
+				for (sock = node->inputs.first; sock; sock = sock->next) {
 					if (!sock->link && !nodeSocketIsHidden(sock)) {
 						
 						gsock = do_versions_node_group_add_socket_2_56_2(ntree, sock->name, sock->type, SOCK_IN);
@@ -2399,18 +2399,18 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *main)
 						/* XXX nodeAddLink does not work with incomplete (node==NULL) links any longer,
 						 * have to create these directly here. These links are updated again in subsequent do_version!
 						 */
-						link= MEM_callocN(sizeof(bNodeLink), "link");
+						link = MEM_callocN(sizeof(bNodeLink), "link");
 						BLI_addtail(&ntree->links, link);
-						link->fromnode= NULL;
-						link->fromsock= gsock;
-						link->tonode= node;
-						link->tosock= sock;
+						link->fromnode = NULL;
+						link->fromsock = gsock;
+						link->tonode = node;
+						link->tosock = sock;
 						ntree->update |= NTREE_UPDATE_LINKS;
 						
 						sock->link = link;
 					}
 				}
-				for (sock=node->outputs.first; sock; sock=sock->next) {
+				for (sock = node->outputs.first; sock; sock = sock->next) {
 					if (nodeCountSocketLinks(ntree, sock)==0 && !nodeSocketIsHidden(sock)) {
 						gsock = do_versions_node_group_add_socket_2_56_2(ntree, sock->name, sock->type, SOCK_OUT);
 						
@@ -2420,12 +2420,12 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *main)
 						/* XXX nodeAddLink does not work with incomplete (node==NULL) links any longer,
 						 * have to create these directly here. These links are updated again in subsequent do_version!
 						 */
-						link= MEM_callocN(sizeof(bNodeLink), "link");
+						link = MEM_callocN(sizeof(bNodeLink), "link");
 						BLI_addtail(&ntree->links, link);
-						link->fromnode= node;
-						link->fromsock= sock;
-						link->tonode= NULL;
-						link->tosock= gsock;
+						link->fromnode = node;
+						link->fromsock = sock;
+						link->tonode = NULL;
+						link->tosock = gsock;
 						ntree->update |= NTREE_UPDATE_LINKS;
 						
 						gsock->link = link;
diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c
index 31410631ce0..c6856d8b71d 100644
--- a/source/blender/blenloader/intern/versioning_legacy.c
+++ b/source/blender/blenloader/intern/versioning_legacy.c
@@ -2306,7 +2306,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *main)
 			Image *ima;
 			for (ima = main->image.first; ima; ima = ima->id.next)
 				if (strcmp(ima->name, "Compositor") == 0) {
-					strcpy(ima->id.name+2, "Viewer Node");
+					strcpy(ima->id.name + 2, "Viewer Node");
 					strcpy(ima->name, "Viewer Node");
 				}
 		}
@@ -2495,11 +2495,11 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *main)
 				ima->gen_x = 256; ima->gen_y = 256;
 				ima->gen_type = 1;
 
-				if (0 == strncmp(ima->id.name+2, "Viewer Node", sizeof(ima->id.name) - 2)) {
+				if (0 == strncmp(ima->id.name + 2, "Viewer Node", sizeof(ima->id.name) - 2)) {
 					ima->source = IMA_SRC_VIEWER;
 					ima->type = IMA_TYPE_COMPOSITE;
 				}
-				if (0 == strncmp(ima->id.name+2, "Render Result", sizeof(ima->id.name) - 2)) {
+				if (0 == strncmp(ima->id.name + 2, "Render Result", sizeof(ima->id.name) - 2)) {
 					ima->source = IMA_SRC_VIEWER;
 					ima->type = IMA_TYPE_R_RESULT;
 				}
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index d78c6687e16..9a4736449a2 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -738,7 +738,7 @@ static void write_nodetree(WriteData *wd, bNodeTree *ntree)
 	
 	if (ntree->adt) write_animdata(wd, ntree->adt);
 	
-	for (node= ntree->nodes.first; node; node= node->next) {
+	for (node = ntree->nodes.first; node; node = node->next) {
 		writestruct(wd, DATA, "bNode", 1, node);
 
 		if (node->prop)
@@ -774,12 +774,12 @@ static void write_nodetree(WriteData *wd, bNodeTree *ntree)
 		
 		if (node->type==CMP_NODE_OUTPUT_FILE) {
 			/* inputs have own storage data */
-			for (sock=node->inputs.first; sock; sock=sock->next)
+			for (sock = node->inputs.first; sock; sock = sock->next)
 				writestruct(wd, DATA, "NodeImageMultiFileSocket", 1, sock->storage);
 		}
 		if (node->type==CMP_NODE_IMAGE) {
 			/* write extra socket info */
-			for (sock=node->outputs.first; sock; sock=sock->next)
+			for (sock = node->outputs.first; sock; sock = sock->next)
 				writestruct(wd, DATA, "NodeImageLayer", 1, sock->storage);
 		}
 	}
diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp
index b8c70871ea1..c3efac55fe7 100644
--- a/source/blender/collada/MeshImporter.cpp
+++ b/source/blender/collada/MeshImporter.cpp
@@ -353,7 +353,7 @@ void MeshImporter::allocate_poly_data(COLLADAFW::Mesh *collada_mesh, Mesh *me)
 				size_t prim_poly_count    = mpvc->getFaceCount();
 
 				size_t prim_loop_count    = 0;
-				for(int index=0; index < prim_poly_count; index++) {
+				for (int index=0; index < prim_poly_count; index++) {
 					prim_loop_count += get_vertex_count(mpvc, index);
 				}
 
diff --git a/source/blender/collada/SceneExporter.cpp b/source/blender/collada/SceneExporter.cpp
index 89f8bb3226b..604e131b44b 100644
--- a/source/blender/collada/SceneExporter.cpp
+++ b/source/blender/collada/SceneExporter.cpp
@@ -178,7 +178,7 @@ void SceneExporter::writeNodes(Object *ob, Scene *sce)
 		if ((ob->transflag & OB_DUPLIGROUP) == OB_DUPLIGROUP && ob->dup_group) {
 			GroupObject *go = NULL;
 			Group *gr = ob->dup_group;
-			/* printf("group detected '%s'\n", gr->id.name+2); */
+			/* printf("group detected '%s'\n", gr->id.name + 2); */
 			for (go = (GroupObject *)(gr->gobject.first); go; go = go->next) {
 				printf("\t%s\n", go->ob->id.name);
 			}
diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp
index 66f7feb8928..84b81f4d332 100644
--- a/source/blender/collada/collada_utils.cpp
+++ b/source/blender/collada/collada_utils.cpp
@@ -143,7 +143,7 @@ Mesh *bc_get_mesh_copy(Scene *scene, Object *ob, BC_export_mesh_type export_mesh
 	Mesh *tmpmesh;
 	CustomDataMask mask = CD_MASK_MESH;
 	DerivedMesh *dm = NULL;
-	if(apply_modifiers) {
+	if (apply_modifiers) {
 		switch (export_mesh_type) {
 			case BC_MESH_TYPE_VIEW: {
 				dm = mesh_create_derived_view(scene, ob, mask);
diff --git a/source/blender/compositor/nodes/COM_GroupNode.cpp b/source/blender/compositor/nodes/COM_GroupNode.cpp
index 3b67d0912d4..09824a7b439 100644
--- a/source/blender/compositor/nodes/COM_GroupNode.cpp
+++ b/source/blender/compositor/nodes/COM_GroupNode.cpp
@@ -44,7 +44,7 @@ static int find_group_input(GroupNode *gnode, const char *identifier, InputSocke
 	int index;
 	for (index = 0; index < gnode->getNumberOfInputSockets(); ++index) {
 		InputSocket *sock = gnode->getInputSocket(index);
-		if (strcmp(sock->getbNodeSocket()->identifier, identifier)==0) {
+		if (STREQ(sock->getbNodeSocket()->identifier, identifier)) {
 			*r_sock = sock;
 			return index;
 		}
@@ -58,7 +58,7 @@ static int find_group_output(GroupNode *gnode, const char *identifier, OutputSoc
 	int index;
 	for (index = 0; index < gnode->getNumberOfOutputSockets(); ++index) {
 		OutputSocket *sock = gnode->getOutputSocket(index);
-		if (strcmp(sock->getbNodeSocket()->identifier, identifier)==0) {
+		if (STREQ(sock->getbNodeSocket()->identifier, identifier)) {
 			*r_sock = sock;
 			return index;
 		}
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index ee2625cf94b..7d8be7ae9c9 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -3076,7 +3076,7 @@ typedef struct ComponentMenuArgs {
 /* NOTE: this is a block-menu, needs 0 events, otherwise the menu closes */
 static uiBlock *component_menu(bContext *C, ARegion *ar, void *args_v)
 {
-	ComponentMenuArgs *args = (ComponentMenuArgs*)args_v;
+	ComponentMenuArgs *args = (ComponentMenuArgs *)args_v;
 	uiBlock *block;
 	uiLayout *layout;
 	
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index 6b278358db9..39a6109bd62 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -390,7 +390,7 @@ const unsigned char *UI_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colo
 				case TH_NODE_GROUP:
 					cp = ts->syntaxc; break;
 				case TH_NODE_INTERFACE:
-					cp= ts->console_output; break;
+					cp = ts->console_output; break;
 				case TH_NODE_FRAME:
 					cp = ts->movie; break;
 				case TH_NODE_MATTE:
@@ -1538,7 +1538,7 @@ void init_userdef_do_versions(void)
 			rgba_char_args_set(btheme->tv3d.editmesh_active, 255, 255, 255, 128);
 		}
 		if (U.coba_weight.tot == 0)
-			init_colorband(&U.coba_weight, 1);
+			init_colorband(&U.coba_weight, true);
 	}
 	if ((bmain->versionfile < 245) || (bmain->versionfile == 245 && bmain->subversionfile < 11)) {
 		bTheme *btheme;
diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c
index fe7e6d01955..013b6d3c606 100644
--- a/source/blender/editors/interface/view2d.c
+++ b/source/blender/editors/interface/view2d.c
@@ -2081,20 +2081,17 @@ void UI_view2d_getscale_inverse(View2D *v2d, float *x, float *y)
 void UI_view2d_getcenter(struct View2D *v2d, float *x, float *y)
 {
 	/* get center */
-	if (x) *x = 0.5f*(v2d->cur.xmin + v2d->cur.xmax);
-	if (y) *y = 0.5f*(v2d->cur.ymin + v2d->cur.ymax);
+	if (x) *x = BLI_rctf_cent_x(&v2d->cur);
+	if (y) *y = BLI_rctf_cent_y(&v2d->cur);
 }
 void UI_view2d_setcenter(struct View2D *v2d, float x, float y)
 {
 	/* get delta from current center */
-	float dx = x - 0.5f*(v2d->cur.xmin + v2d->cur.xmax);
-	float dy = y - 0.5f*(v2d->cur.ymin + v2d->cur.ymax);
-	
+	float dx = x - BLI_rctf_cent_x(&v2d->cur);
+	float dy = y - BLI_rctf_cent_y(&v2d->cur);
+
 	/* add to cur */
-	v2d->cur.xmin += dx;
-	v2d->cur.xmax += dx;
-	v2d->cur.ymin += dy;
-	v2d->cur.ymax += dy;
+	BLI_rctf_translate(&v2d->cur, dx, dy);
 	
 	/* make sure that 'cur' rect is in a valid state as a result of these changes */
 	UI_view2d_curRect_validate(v2d);
diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c
index 8e2a87c7c64..9b61fa44955 100644
--- a/source/blender/editors/object/object_constraint.c
+++ b/source/blender/editors/object/object_constraint.c
@@ -604,7 +604,7 @@ static bConstraint *edit_constraint_property_get(wmOperator *op, Object *ob, int
 			list = &pchan->constraints;
 		else {
 			//if (G.debug & G_DEBUG)
-			//printf("edit_constraint_property_get: No active bone for object '%s'\n", (ob)? ob->id.name+2 : "<None>");
+			//printf("edit_constraint_property_get: No active bone for object '%s'\n", (ob)? ob->id.name + 2 : "<None>");
 			return NULL;
 		}
 	}
diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c
index fa7e888f8d7..816ad9960df 100644
--- a/source/blender/editors/space_logic/logic_window.c
+++ b/source/blender/editors/space_logic/logic_window.c
@@ -2321,7 +2321,7 @@ void logic_buttons(bContext *C, ARegion *ar)
 		uiItemR(split, &settings_ptr, "show_state_panel", UI_ITEM_R_NO_BG, "", ICON_DISCLOSURE_TRI_RIGHT);
 
 		row = uiLayoutRow(split, TRUE);
-		uiDefButBitS(block, TOG, OB_SHOWCONT, B_REDR, ob->id.name+2, (short)(xco - U.widget_unit / 2), yco, (short)(width - 1.5f * U.widget_unit), UI_UNIT_Y, &ob->scaflag, 0, 31, 0, 0, TIP_("Object name, click to show/hide controllers"));
+		uiDefButBitS(block, TOG, OB_SHOWCONT, B_REDR, ob->id.name + 2, (short)(xco - U.widget_unit / 2), yco, (short)(width - 1.5f * U.widget_unit), UI_UNIT_Y, &ob->scaflag, 0, 31, 0, 0, TIP_("Object name, click to show/hide controllers"));
 
 		RNA_pointer_create((ID *)ob, &RNA_Object, ob, &object_ptr);
 		uiLayoutSetContextPointer(row, "object", &object_ptr);
@@ -2418,7 +2418,7 @@ void logic_buttons(bContext *C, ARegion *ar)
 		if ((ob->scavisflag & OB_VIS_SENS) == 0) continue;
 
 		row = uiLayoutRow(layout, TRUE);
-		uiDefButBitS(block, TOG, OB_SHOWSENS, B_REDR, ob->id.name+2, (short)(xco - U.widget_unit / 2), yco, (short)(width - 1.5f * U.widget_unit), UI_UNIT_Y, &ob->scaflag, 0, 31, 0, 0, TIP_("Object name, click to show/hide sensors"));
+		uiDefButBitS(block, TOG, OB_SHOWSENS, B_REDR, ob->id.name + 2, (short)(xco - U.widget_unit / 2), yco, (short)(width - 1.5f * U.widget_unit), UI_UNIT_Y, &ob->scaflag, 0, 31, 0, 0, TIP_("Object name, click to show/hide sensors"));
 
 		RNA_pointer_create((ID *)ob, &RNA_Object, ob, &object_ptr);
 		uiLayoutSetContextPointer(row, "object", &object_ptr);
@@ -2489,7 +2489,7 @@ void logic_buttons(bContext *C, ARegion *ar)
 		}
 
 		row = uiLayoutRow(layout, TRUE);
-		uiDefButBitS(block, TOG, OB_SHOWACT, B_REDR, ob->id.name+2, (short)(xco - U.widget_unit / 2), yco, (short)(width - 1.5f * U.widget_unit), UI_UNIT_Y, &ob->scaflag, 0, 31, 0, 0, TIP_("Object name, click to show/hide actuators"));
+		uiDefButBitS(block, TOG, OB_SHOWACT, B_REDR, ob->id.name + 2, (short)(xco - U.widget_unit / 2), yco, (short)(width - 1.5f * U.widget_unit), UI_UNIT_Y, &ob->scaflag, 0, 31, 0, 0, TIP_("Object name, click to show/hide actuators"));
 
 		RNA_pointer_create((ID *)ob, &RNA_Object, ob, &object_ptr);
 		uiLayoutSetContextPointer(row, "object", &object_ptr);
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index fddecf267a9..0b02aef2fab 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -81,34 +81,34 @@
 
 static void node_add_menu_class(bContext *C, uiLayout *layout, void *arg_nodeclass)
 {
-	Scene *scene= CTX_data_scene(C);
-	SpaceNode *snode= CTX_wm_space_node(C);
+	Scene *scene = CTX_data_scene(C);
+	SpaceNode *snode = CTX_wm_space_node(C);
 	bNodeTree *ntree;
-	int nodeclass= GET_INT_FROM_POINTER(arg_nodeclass);
-	int event, compatibility= 0;
+	int nodeclass = GET_INT_FROM_POINTER(arg_nodeclass);
+	int event, compatibility = 0;
 	
 	ntree = snode->nodetree;
 	
-	if(!ntree) {
+	if (!ntree) {
 		uiItemS(layout);
 		return;
 	}
 
-	if(ntree->type == NTREE_SHADER) {
-		if(BKE_scene_use_new_shading_nodes(scene))
-			compatibility= NODE_NEW_SHADING;
+	if (ntree->type == NTREE_SHADER) {
+		if (BKE_scene_use_new_shading_nodes(scene))
+			compatibility = NODE_NEW_SHADING;
 		else
-			compatibility= NODE_OLD_SHADING;
+			compatibility = NODE_OLD_SHADING;
 	}
 	
-	if (nodeclass==NODE_CLASS_GROUP) {
-		Main *bmain= CTX_data_main(C);
+	if (nodeclass == NODE_CLASS_GROUP) {
+		Main *bmain = CTX_data_main(C);
 		bNodeTree *ngroup;
 		const char *ngroup_type, *node_type;
 		PointerRNA ptr;
 		
 		NODE_TYPES_BEGIN(ntype)
-			if (ntype->nclass!=nodeclass || !ntype->ui_name)
+			if (ntype->nclass != nodeclass || !ntype->ui_name)
 				continue;
 			if (!ntype->poll(ntype, ntree))
 				continue;
@@ -132,33 +132,32 @@ static void node_add_menu_class(bContext *C, uiLayout *layout, void *arg_nodecla
 			RNA_string_set(&ptr, "node_type", node_type);
 			
 			uiItemS(layout);
-			
-			for(ngroup=bmain->nodetree.first, event=0; ngroup; ngroup= ngroup->id.next, ++event) {
+
+			for (ngroup = bmain->nodetree.first, event = 0; ngroup; ngroup = ngroup->id.next, ++event) {
 				/* only use group trees of the right type */
-				if (strcmp(ngroup->idname, ngroup_type)!=0)
+				if (STRNEQ(ngroup->idname, ngroup_type))
 					continue;
 				if (!nodeGroupPoll(ntree, ngroup))
 					continue;
 				
-				ptr = uiItemFullO(layout, "NODE_OT_add_group_node", ngroup->id.name+2, ntype->ui_icon, NULL, WM_OP_INVOKE_DEFAULT, UI_ITEM_O_RETURN_PROPS);
+				ptr = uiItemFullO(layout, "NODE_OT_add_group_node", ngroup->id.name + 2, ntype->ui_icon, NULL, WM_OP_INVOKE_DEFAULT, UI_ITEM_O_RETURN_PROPS);
 				RNA_string_set(&ptr, "type", ntype->idname);
-				RNA_string_set(&ptr, "grouptree", ngroup->id.name+2);
+				RNA_string_set(&ptr, "grouptree", ngroup->id.name + 2);
 			}
 		NODE_TYPES_END
 	}
-	else if (nodeclass==NODE_DYNAMIC) {
+	else if (nodeclass == NODE_DYNAMIC) {
 		/* disabled */
 	}
-	else 
-	{
+	else {
 		PointerRNA ptr;
 		
 		NODE_TYPES_BEGIN(ntype)
-			if (ntype->nclass!=nodeclass || !ntype->ui_name)
+			if (ntype->nclass != nodeclass || !ntype->ui_name)
 				continue;
 			if (!ntype->poll(ntype, ntree))
 				continue;
-			if (compatibility && (ntype->compatibility & compatibility)==0)
+			if (compatibility && (ntype->compatibility & compatibility) == 0)
 				continue;
 			
 			ptr = uiItemFullO(layout, "NODE_OT_add_node", IFACE_(ntype->ui_name), ntype->ui_icon, NULL, WM_OP_INVOKE_DEFAULT, UI_ITEM_O_RETURN_PROPS);
@@ -169,15 +168,15 @@ static void node_add_menu_class(bContext *C, uiLayout *layout, void *arg_nodecla
 
 static void node_add_menu_foreach_class_cb(void *calldata, int nclass, const char *name)
 {
-	uiLayout *layout= calldata;
+	uiLayout *layout = calldata;
 	uiItemMenuF(layout, IFACE_(name), 0, node_add_menu_class, SET_INT_IN_POINTER(nclass));
 }
 
 static void node_add_menu_default(const bContext *C, uiLayout *layout, bNodeTree *ntree)
 {
-	Scene *scene= CTX_data_scene(C);
+	Scene *scene = CTX_data_scene(C);
 	
-	if(ntree->typeinfo->foreach_nodeclass)
+	if (ntree->typeinfo->foreach_nodeclass)
 		ntree->typeinfo->foreach_nodeclass(scene, layout, node_add_menu_foreach_class_cb);
 }
 
diff --git a/source/blender/editors/space_node/node_add.c b/source/blender/editors/space_node/node_add.c
index cd04957c0a5..765f2b67549 100644
--- a/source/blender/editors/space_node/node_add.c
+++ b/source/blender/editors/space_node/node_add.c
@@ -324,7 +324,7 @@ static int node_add_file_exec(bContext *C, wmOperator *op)
 	SpaceNode *snode = CTX_wm_space_node(C);
 	bNode *node;
 	Image *ima = NULL;
-	int type= 0;
+	int type = 0;
 
 	/* check input variables */
 	if (RNA_struct_property_is_set(op->ptr, "filepath")) {
@@ -427,7 +427,7 @@ void NODE_OT_add_file(wmOperatorType *ot)
 
 static int new_node_tree_exec(bContext *C, wmOperator *op)
 {
-	SpaceNode *snode= CTX_wm_space_node(C);
+	SpaceNode *snode = CTX_wm_space_node(C);
 	Main *bmain = CTX_data_main(C);
 	bNodeTree *ntree;
 	PointerRNA ptr, idptr;
diff --git a/source/blender/editors/space_node/node_buttons.c b/source/blender/editors/space_node/node_buttons.c
index 30cc3b93e8a..31e3cebeb3f 100644
--- a/source/blender/editors/space_node/node_buttons.c
+++ b/source/blender/editors/space_node/node_buttons.c
@@ -162,7 +162,7 @@ static void node_sockets_panel(const bContext *C, Panel *pa)
 
 static int node_tree_interface_poll(const bContext *C, PanelType *UNUSED(pt))
 {
-	SpaceNode *snode= CTX_wm_space_node(C);
+	SpaceNode *snode = CTX_wm_space_node(C);
 	
 	return (snode && snode->edittree && (snode->edittree->inputs.first || snode->edittree->outputs.first));
 }
@@ -192,14 +192,14 @@ static int node_tree_find_active_socket(bNodeTree *ntree, bNodeSocket **r_sock,
 
 static void node_tree_interface_panel(const bContext *C, Panel *pa)
 {
-	SpaceNode *snode= CTX_wm_space_node(C);
-	bNodeTree *ntree= (snode) ? snode->edittree : NULL;
+	SpaceNode *snode = CTX_wm_space_node(C);
+	bNodeTree *ntree = (snode) ? snode->edittree : NULL;
 	bNodeSocket *sock;
 	int in_out;
-	uiLayout *layout= pa->layout, *row, *split, *col;
+	uiLayout *layout = pa->layout, *row, *split, *col;
 	PointerRNA ptr, sockptr, opptr;
-	
-	if(!ntree)
+
+	if (!ntree)
 		return;
 	
 	RNA_id_pointer_create((ID *)ntree, &ptr);
@@ -212,13 +212,13 @@ static void node_tree_interface_panel(const bContext *C, Panel *pa)
 	split = uiLayoutRow(row, TRUE);
 	col = uiLayoutColumn(split, TRUE);
 	uiItemL(col, "Inputs:", ICON_NONE);
-	uiTemplateList(col, (bContext*)C, "NODE_UL_interface_sockets", "", &ptr, "inputs", &ptr, "active_input", 0, 0, 0);
+	uiTemplateList(col, (bContext *)C, "NODE_UL_interface_sockets", "", &ptr, "inputs", &ptr, "active_input", 0, 0, 0);
 	opptr = uiItemFullO(col, "NODE_OT_tree_socket_add", "", ICON_PLUS, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_O_RETURN_PROPS);
 	RNA_enum_set(&opptr, "in_out", SOCK_IN);
 	
 	col = uiLayoutColumn(split, TRUE);
 	uiItemL(col, "Outputs:", ICON_NONE);
-	uiTemplateList(col, (bContext*)C, "NODE_UL_interface_sockets", "", &ptr, "outputs", &ptr, "active_output", 0, 0, 0);
+	uiTemplateList(col, (bContext *)C, "NODE_UL_interface_sockets", "", &ptr, "outputs", &ptr, "active_output", 0, 0, 0);
 	opptr = uiItemFullO(col, "NODE_OT_tree_socket_add", "", ICON_PLUS, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_O_RETURN_PROPS);
 	RNA_enum_set(&opptr, "in_out", SOCK_OUT);
 	
@@ -236,7 +236,7 @@ static void node_tree_interface_panel(const bContext *C, Panel *pa)
 		uiItemS(layout);
 		
 		if (sock->typeinfo->interface_draw)
-			sock->typeinfo->interface_draw((bContext*)C, layout, &sockptr);
+			sock->typeinfo->interface_draw((bContext *)C, layout, &sockptr);
 	}
 }
 
@@ -261,11 +261,11 @@ void node_buttons_register(ARegionType *art)
 	pt->flag |= PNL_DEFAULT_CLOSED;
 	BLI_addtail(&art->paneltypes, pt);
 
-	pt= MEM_callocN(sizeof(PanelType), "spacetype node panel tree interface");
+	pt = MEM_callocN(sizeof(PanelType), "spacetype node panel tree interface");
 	strcpy(pt->idname, "NODE_PT_node_tree_interface");
 	strcpy(pt->label, "Interface");
-	pt->draw= node_tree_interface_panel;
-	pt->poll= node_tree_interface_poll;
+	pt->draw = node_tree_interface_panel;
+	pt->poll = node_tree_interface_poll;
 	BLI_addtail(&art->paneltypes, pt);
 
 	pt = MEM_callocN(sizeof(PanelType), "spacetype node panel gpencil");
diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c
index 80a6ff1a393..0636dee9bc5 100644
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@ -89,17 +89,17 @@ static bNodeTree *node_tree_from_ID(ID *id)
 	
 		switch (idtype) {
 		case ID_NT:
-			return (bNodeTree*)id;
+			return (bNodeTree *)id;
 		case ID_MA:
-			return ((Material*)id)->nodetree;
+			return ((Material *)id)->nodetree;
 		case ID_LA:
-			return ((Lamp*)id)->nodetree;
+			return ((Lamp *)id)->nodetree;
 		case ID_WO:
-			return ((World*)id)->nodetree;
+			return ((World *)id)->nodetree;
 		case ID_SCE:
-			return ((Scene*)id)->nodetree;
+			return ((Scene *)id)->nodetree;
 		case ID_TE:
-			return ((Tex*)id)->nodetree;
+			return ((Tex *)id)->nodetree;
 		}
 	}
 	
@@ -339,7 +339,7 @@ static void node_update_basis(const bContext *C, bNodeTree *ntree, bNode *node)
 		RNA_pointer_create(&ntree->id, &RNA_NodeSocket, nsock, &sockptr);
 		
 		layout = uiBlockLayout(node->block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL,
-		                       locx+NODE_DYS, dy, NODE_WIDTH(node)-NODE_DY, NODE_DY, UI_GetStyle());
+		                       locx + NODE_DYS, dy, NODE_WIDTH(node) - NODE_DY, NODE_DY, UI_GetStyle());
 		/* context pointers for current node and socket */
 		uiLayoutSetContextPointer(layout, "node", &nodeptr);
 		uiLayoutSetContextPointer(layout, "socket", &sockptr);
@@ -427,7 +427,7 @@ static void node_update_basis(const bContext *C, bNodeTree *ntree, bNode *node)
 		RNA_pointer_create(&ntree->id, &RNA_NodeSocket, nsock, &sockptr);
 		
 		layout = uiBlockLayout(node->block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL,
-		                       locx+NODE_DYS, dy, NODE_WIDTH(node)-NODE_DY, NODE_DY, UI_GetStyle());
+		                       locx + NODE_DYS, dy, NODE_WIDTH(node) - NODE_DY, NODE_DY, UI_GetStyle());
 		/* context pointers for current node and socket */
 		uiLayoutSetContextPointer(layout, "node", &nodeptr);
 		uiLayoutSetContextPointer(layout, "socket", &sockptr);
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index 2012284f39b..98f5939b367 100644
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -290,11 +290,11 @@ void snode_notify(bContext *C, SpaceNode *snode)
 {
 	WM_event_add_notifier(C, NC_NODE | NA_EDITED, NULL);
 
-	if(ED_node_is_shader(snode))
+	if (ED_node_is_shader(snode))
 		WM_event_add_notifier(C, NC_MATERIAL | ND_NODES, snode->id);
-	else if(ED_node_is_compositor(snode))
+	else if (ED_node_is_compositor(snode))
 		WM_event_add_notifier(C, NC_SCENE | ND_NODES, snode->id);
-	else if(ED_node_is_texture(snode))
+	else if (ED_node_is_texture(snode))
 		WM_event_add_notifier(C, NC_TEXTURE | ND_NODES, snode->id);
 }
 
@@ -308,17 +308,17 @@ void ED_node_set_tree_type(SpaceNode *snode, bNodeTreeType *typeinfo)
 
 int ED_node_is_compositor(struct SpaceNode *snode)
 {
-	return (strcmp(snode->tree_idname, ntreeType_Composite->idname)==0);
+	return STREQ(snode->tree_idname, ntreeType_Composite->idname);
 }
 
 int ED_node_is_shader(struct SpaceNode *snode)
 {
-	return (strcmp(snode->tree_idname, ntreeType_Shader->idname)==0);
+	return STREQ(snode->tree_idname, ntreeType_Shader->idname);
 }
 
 int ED_node_is_texture(struct SpaceNode *snode)
 {
-	return (strcmp(snode->tree_idname, ntreeType_Texture->idname)==0);
+	return STREQ(snode->tree_idname, ntreeType_Texture->idname);
 }
 
 /* assumes nothing being done in ntree yet, sets the default in/out node */
@@ -513,8 +513,9 @@ void snode_set_context(const bContext *C)
 		snode->flag &= ~SNODE_NEW_SHADERS;
 	
 	/* check the tree type */
-	if (!treetype
-	    || (treetype->poll && !treetype->poll(C, treetype))) {
+	if (!treetype ||
+	    (treetype->poll && !treetype->poll(C, treetype)))
+	{
 		/* invalid tree type, disable */
 		snode->tree_idname[0] = '\0';
 		ED_node_tree_start(snode, NULL, NULL, NULL);
@@ -533,8 +534,9 @@ void snode_set_context(const bContext *C)
 			treetype->get_from_context(C, treetype, &ntree, &id, &from);
 	}
 	
-	if (snode->nodetree!=ntree || snode->id!=id || snode->from!=snode->from)
+	if (snode->nodetree != ntree || snode->id != id || snode->from != snode->from) {
 		ED_node_tree_start(snode, ntree, id, from);
+	}
 }
 
 void snode_update(SpaceNode *snode, bNode *node)
@@ -547,11 +549,11 @@ void snode_update(SpaceNode *snode, bNode *node)
 	 */
 	
 	/* update all edited group nodes */
-	path=snode->treepath.last;
+	path = snode->treepath.last;
 	if (path) {
 		bNodeTree *ngroup = path->nodetree;
-		for (path=path->prev; path; path=path->prev) {
-			nodeUpdateID(path->nodetree, (ID*)ngroup);
+		for (path = path->prev; path; path = path->prev) {
+			nodeUpdateID(path->nodetree, (ID *)ngroup);
 			ngroup = path->nodetree;
 		}
 	}
@@ -2077,15 +2079,15 @@ static int ntree_socket_add_exec(bContext *C, wmOperator *op)
 void NODE_OT_tree_socket_add(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Add Node Tree Interface Socket";
-	ot->idname= "NODE_OT_tree_socket_add";
+	ot->name = "Add Node Tree Interface Socket";
+	ot->idname = "NODE_OT_tree_socket_add";
 	
 	/* api callbacks */
-	ot->exec= ntree_socket_add_exec;
-	ot->poll= ED_operator_node_active;
+	ot->exec = ntree_socket_add_exec;
+	ot->poll = ED_operator_node_active;
 	
 	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 	
 	RNA_def_enum(ot->srna, "in_out", node_socket_in_out_items, SOCK_IN, "Socket Type", "");
 }
@@ -2120,15 +2122,15 @@ static int ntree_socket_remove_exec(bContext *C, wmOperator *UNUSED(op))
 void NODE_OT_tree_socket_remove(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Remove Node Tree Interface Socket";
-	ot->idname= "NODE_OT_tree_socket_remove";
+	ot->name = "Remove Node Tree Interface Socket";
+	ot->idname = "NODE_OT_tree_socket_remove";
 	
 	/* api callbacks */
-	ot->exec= ntree_socket_remove_exec;
-	ot->poll= ED_operator_node_active;
+	ot->exec = ntree_socket_remove_exec;
+	ot->poll = ED_operator_node_active;
 	
 	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 }
 
 /********************** Move interface socket operator *********************/
@@ -2185,15 +2187,15 @@ static int ntree_socket_move_exec(bContext *C, wmOperator *op)
 void NODE_OT_tree_socket_move(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Move Node Tree Socket";
-	ot->idname= "NODE_OT_tree_socket_move";
+	ot->name = "Move Node Tree Socket";
+	ot->idname = "NODE_OT_tree_socket_move";
 	
 	/* api callbacks */
-	ot->exec= ntree_socket_move_exec;
-	ot->poll= ED_operator_node_active;
+	ot->exec = ntree_socket_move_exec;
+	ot->poll = ED_operator_node_active;
 	
 	/* flags */
-	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 	
 	RNA_def_enum(ot->srna, "direction", move_direction_items, 1, "Direction", "");
 }
diff --git a/source/blender/editors/space_node/node_group.c b/source/blender/editors/space_node/node_group.c
index ba98f9ea94d..f460c68638f 100644
--- a/source/blender/editors/space_node/node_group.c
+++ b/source/blender/editors/space_node/node_group.c
@@ -137,7 +137,7 @@ static bNode *node_group_get_active(bContext *C, const char *node_idname)
 	SpaceNode *snode = CTX_wm_space_node(C);
 	bNode *node = nodeGetActive(snode->edittree);
 	
-	if (node && strcmp(node->idname, node_idname)==0)
+	if (node && STREQ(node->idname, node_idname))
 		return node;
 	else
 		return NULL;
@@ -161,7 +161,7 @@ static int node_group_edit_exec(bContext *C, wmOperator *op)
 	MEM_freeN(node_idname);
 	
 	if (gnode && !exit) {
-		bNodeTree *ngroup= (bNodeTree*)gnode->id;
+		bNodeTree *ngroup = (bNodeTree *)gnode->id;
 		
 		if (ngroup) {
 			if (ngroup->id.lib)
@@ -240,8 +240,8 @@ static int node_group_ungroup(bNodeTree *ntree, bNode *gnode)
 	wgroup = ntreeCopyTree_ex(ngroup, FALSE);
 	
 	/* Add the nodes into the ntree */
-	for(node= wgroup->nodes.first; node; node= nextnode) {
-		nextnode= node->next;
+	for (node = wgroup->nodes.first; node; node = nextnode) {
+		nextnode = node->next;
 		
 		/* Remove interface nodes.
 		 * This also removes remaining links to and from interface nodes.
@@ -329,7 +329,7 @@ static int node_group_ungroup(bNodeTree *ntree, bNode *gnode)
 			
 			/* find external links to this input */
 			for (tlink = ntree->links.first; tlink; tlink = tlink->next) {
-				if (tlink->tonode == gnode && strcmp(tlink->tosock->identifier, identifier)==0) {
+				if (tlink->tonode == gnode && STREQ(tlink->tosock->identifier, identifier)) {
 					nodeAddLink(ntree, tlink->fromnode, tlink->fromsock, link->tonode->new_node, link->tosock->new_sock);
 					++num_external_links;
 				}
@@ -356,7 +356,7 @@ static int node_group_ungroup(bNodeTree *ntree, bNode *gnode)
 			for (tlink = ngroup->links.first; tlink; tlink = tlink->next) {
 				/* only use active output node */
 				if (tlink->tonode->type == NODE_GROUP_OUTPUT && (tlink->tonode->flag & NODE_DO_OUTPUT)) {
-					if (strcmp(tlink->tosock->identifier, identifier)==0) {
+					if (STREQ(tlink->tosock->identifier, identifier)) {
 						nodeAddLink(ntree, tlink->fromnode->new_node, tlink->fromsock->new_sock, link->tonode, link->tosock);
 						++num_internal_links;
 					}
@@ -642,19 +642,19 @@ void NODE_OT_group_separate(wmOperatorType *ot)
 
 /* ****************** Make Group operator ******************* */
 
-static int node_group_make_use_node(bNode *node, bNode *gnode)
+static bool node_group_make_use_node(bNode *node, bNode *gnode)
 {
-	return (node != gnode
-	        && !ELEM(node->type, NODE_GROUP_INPUT, NODE_GROUP_OUTPUT)
-	        && (node->flag & NODE_SELECT));
+	return (node != gnode &&
+	        !ELEM(node->type, NODE_GROUP_INPUT, NODE_GROUP_OUTPUT) &&
+	        (node->flag & NODE_SELECT));
 }
 
-static int node_group_make_test_selected(bNodeTree *ntree, bNode *gnode, const char *ntree_idname, struct ReportList *reports)
+static bool node_group_make_test_selected(bNodeTree *ntree, bNode *gnode, const char *ntree_idname, struct ReportList *reports)
 {
 	bNodeTree *ngroup;
 	bNode *node;
 	bNodeLink *link;
-	int ok = TRUE;
+	int ok = true;
 	
 	/* make a local pseudo node tree to pass to the node poll functions */
 	ngroup = ntreeAddTree(NULL, "Pseudo Node Group", ntree_idname);
@@ -664,7 +664,7 @@ static int node_group_make_test_selected(bNodeTree *ntree, bNode *gnode, const c
 		if (node_group_make_use_node(node, gnode)) {
 			if (!node->typeinfo->poll_instance(node, ngroup)) {
 				BKE_reportf(reports, RPT_WARNING, "Can not add node '%s' in a group", node->name);
-				ok = FALSE;
+				ok = false;
 				break;
 			}
 		}
@@ -676,7 +676,7 @@ static int node_group_make_test_selected(bNodeTree *ntree, bNode *gnode, const c
 	ntreeFreeTree(ngroup);
 	MEM_freeN(ngroup);
 	if (!ok)
-		return FALSE;
+		return false;
 	
 	/* check if all connections are OK, no unselected node has both
 	 * inputs and outputs to a selection */
@@ -687,12 +687,14 @@ static int node_group_make_test_selected(bNodeTree *ntree, bNode *gnode, const c
 			link->fromnode->done |= 2;
 	}
 	for (node = ntree->nodes.first; node; node = node->next) {
-		if (!(node->flag & NODE_SELECT)
-		    && node != gnode
-		    && node->done == 3)
-			return FALSE;
+		if (!(node->flag & NODE_SELECT) &&
+		    node != gnode &&
+		    node->done == 3)
+		{
+			return false;
+		}
 	}
-	return TRUE;
+	return true;
 }
 
 static int node_get_selected_minmax(bNodeTree *ntree, bNode *gnode, float *min, float *max)
diff --git a/source/blender/editors/space_node/node_ops.c b/source/blender/editors/space_node/node_ops.c
index db664265466..1e4e02b6ae1 100644
--- a/source/blender/editors/space_node/node_ops.c
+++ b/source/blender/editors/space_node/node_ops.c
@@ -213,11 +213,11 @@ static void node_group_operators(wmKeyMap *keymap, const char *node_type)
 	kmi = WM_keymap_add_item(keymap, "NODE_OT_group_separate", PKEY, KM_PRESS, 0, 0);
 	RNA_string_set(kmi->ptr, "node_type", node_type);
 	
-	kmi= WM_keymap_add_item(keymap, "NODE_OT_group_edit", TABKEY, KM_PRESS, 0, 0);
+	kmi = WM_keymap_add_item(keymap, "NODE_OT_group_edit", TABKEY, KM_PRESS, 0, 0);
 	RNA_string_set(kmi->ptr, "node_type", node_type);
 	RNA_boolean_set(kmi->ptr, "exit", FALSE);
 	
-	kmi= WM_keymap_add_item(keymap, "NODE_OT_group_edit", TABKEY, KM_PRESS, KM_SHIFT, 0);
+	kmi = WM_keymap_add_item(keymap, "NODE_OT_group_edit", TABKEY, KM_PRESS, KM_SHIFT, 0);
 	RNA_string_set(kmi->ptr, "node_type", node_type);
 	RNA_boolean_set(kmi->ptr, "exit", TRUE);
 }
@@ -263,7 +263,7 @@ void node_keymap(struct wmKeyConfig *keyconf)
 	kmi = WM_keymap_add_item(keymap, "NODE_OT_link", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0);
 		RNA_boolean_set(kmi->ptr, "detach", FALSE);
 		RNA_boolean_set(kmi->ptr, "expose", TRUE);
-	kmi = WM_keymap_add_item(keymap, "NODE_OT_link", LEFTMOUSE, KM_PRESS, KM_SHIFT|KM_CTRL, 0);
+	kmi = WM_keymap_add_item(keymap, "NODE_OT_link", LEFTMOUSE, KM_PRESS, KM_SHIFT | KM_CTRL, 0);
 		RNA_boolean_set(kmi->ptr, "detach", TRUE);
 		RNA_boolean_set(kmi->ptr, "expose", TRUE);
 	WM_keymap_add_item(keymap, "NODE_OT_resize", LEFTMOUSE, KM_PRESS, 0, 0);
diff --git a/source/blender/editors/space_node/node_relationships.c b/source/blender/editors/space_node/node_relationships.c
index d95487bb24e..8ff964aa932 100644
--- a/source/blender/editors/space_node/node_relationships.c
+++ b/source/blender/editors/space_node/node_relationships.c
@@ -108,7 +108,7 @@ static bNodeSocket *best_socket_output(bNodeTree *ntree, bNode *node, bNodeSocke
 
 		/* check for same types */
 		if (sock->type == sock_target->type) {
-			if (strcmp(sock->name, sock_target->name) == 0)
+			if (STREQ(sock->name, sock_target->name))
 				return sock;
 		}
 	}
@@ -547,7 +547,7 @@ static int node_link_modal(bContext *C, wmOperator *op, const wmEvent *event)
 							
 							{
 								/* place the node at the mouse pointer */
-								float sockx = 42.f + 3*HIDDEN_RAD;	/* XXX totally arbitrary initial hidden node size ... */
+								float sockx = 42.0f + 3 * HIDDEN_RAD;  /* XXX totally arbitrary initial hidden node size ... */
 								float socky = -HIDDEN_RAD;
 								
 								ionode->locx = snode->cursor[0] - sockx;
diff --git a/source/blender/editors/space_node/node_select.c b/source/blender/editors/space_node/node_select.c
index 291fe86e016..faebeabdbba 100644
--- a/source/blender/editors/space_node/node_select.c
+++ b/source/blender/editors/space_node/node_select.c
@@ -359,8 +359,9 @@ static int node_mouse_select(Main *bmain, SpaceNode *snode, ARegion *ar, const i
 		node = node_under_mouse_select(snode->edittree, mx, my);
 		
 		if (node) {
-			for (tnode = snode->edittree->nodes.first; tnode; tnode = tnode->next)
-					nodeSetSelected(tnode, FALSE);
+			for (tnode = snode->edittree->nodes.first; tnode; tnode = tnode->next) {
+				nodeSetSelected(tnode, false);
+			}
 			nodeSetSelected(node, TRUE);
 			ED_node_set_active(bmain, snode->edittree, node);
 			selected = 1;
diff --git a/source/blender/editors/space_node/node_templates.c b/source/blender/editors/space_node/node_templates.c
index e4b0512d992..0bc2fba0d0b 100644
--- a/source/blender/editors/space_node/node_templates.c
+++ b/source/blender/editors/space_node/node_templates.c
@@ -172,7 +172,8 @@ static void node_socket_add_replace(const bContext *C, bNodeTree *ntree, bNode *
 
 	/* XXX how can this be done nicely? bNodeTemplate is removed, it doesn't work for generic custom nodes */
 	if (node_prev && node_prev->type == type &&
-	    (type != NODE_GROUP || node_prev->id == &ngroup->id)) {
+	    (type != NODE_GROUP || node_prev->id == &ngroup->id))
+	{
 		/* keep the previous node if it's the same type */
 		node_from = node_prev;
 	}
@@ -182,8 +183,8 @@ static void node_socket_add_replace(const bContext *C, bNodeTree *ntree, bNode *
 		node_from->locy = node_to->locy;
 		
 		/* XXX bad, should be dispatched to generic operator or something ... */
-		if (type==NODE_GROUP) {
-			node_from->id = (ID*)ngroup;
+		if (type == NODE_GROUP) {
+			node_from->id = (ID *)ngroup;
 		}
 		
 		if (node_from->id)
@@ -206,7 +207,7 @@ static void node_socket_add_replace(const bContext *C, bNodeTree *ntree, bNode *
 				if (nodeCountSocketLinks(ntree, sock_from) >= sock_from->limit)
 					continue;
 
-				if (strcmp(sock_prev->name, sock_from->name) == 0 && sock_prev->type == sock_from->type) {
+				if (STREQ(sock_prev->name, sock_from->name) && sock_prev->type == sock_from->type) {
 					bNodeLink *link = sock_prev->link;
 
 					if (link && link->fromnode) {
@@ -377,8 +378,8 @@ static void ui_node_menu_column(NodeLinkArg *arg, int nclass, const char *cname)
 			else
 				BLI_strncpy(name, IFACE_(ntype->ui_name), UI_MAX_NAME_STR);
 			
-			but = uiDefBut(block, BUT, 0, name, 0, 0, UI_UNIT_X*4, UI_UNIT_Y,
-				NULL, 0.0, 0.0, 0.0, 0.0, TIP_("Add node to input"));
+			but = uiDefBut(block, BUT, 0, name, 0, 0, UI_UNIT_X * 4, UI_UNIT_Y,
+			               NULL, 0.0, 0.0, 0.0, 0.0, TIP_("Add node to input"));
 			
 			argN = MEM_dupallocN(arg);
 			argN->type = ntype->type;
diff --git a/source/blender/editors/space_node/node_view.c b/source/blender/editors/space_node/node_view.c
index 1241227c9d8..293913dff11 100644
--- a/source/blender/editors/space_node/node_view.c
+++ b/source/blender/editors/space_node/node_view.c
@@ -371,7 +371,7 @@ int ED_space_node_color_sample(SpaceNode *snode, ARegion *ar, int mval[2], float
 	float fx, fy, bufx, bufy;
 	int ret = FALSE;
 
-	if (strcmp(snode->tree_idname, ntreeType_Composite->idname)==0 || (snode->flag & SNODE_BACKDRAW) == 0) {
+	if (STREQ(snode->tree_idname, ntreeType_Composite->idname) || (snode->flag & SNODE_BACKDRAW) == 0) {
 		/* use viewer image for color sampling only if we're in compositor tree
 		 * with backdrop enabled
 		 */
diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c
index ac2f36ed51d..2d5207e69db 100644
--- a/source/blender/editors/space_node/space_node.c
+++ b/source/blender/editors/space_node/space_node.c
@@ -65,7 +65,7 @@
 void ED_node_tree_start(SpaceNode *snode, bNodeTree *ntree, ID *id, ID *from)
 {
 	bNodeTreePath *path, *path_next;
-	for (path=snode->treepath.first; path; path=path_next) {
+	for (path = snode->treepath.first; path; path = path_next) {
 		path_next = path->next;
 		MEM_freeN(path);
 	}
@@ -76,7 +76,7 @@ void ED_node_tree_start(SpaceNode *snode, bNodeTree *ntree, ID *id, ID *from)
 		path->nodetree = ntree;
 		path->parent_key = NODE_INSTANCE_KEY_BASE;
 		if (id)
-			BLI_strncpy(path->node_name, id->name+2, sizeof(path->node_name));
+			BLI_strncpy(path->node_name, id->name + 2, sizeof(path->node_name));
 		BLI_addtail(&snode->treepath, path);
 	}
 	
@@ -86,7 +86,7 @@ void ED_node_tree_start(SpaceNode *snode, bNodeTree *ntree, ID *id, ID *from)
 	snode->from = from;
 	
 	/* listener updates the View2D center from edittree */
-	WM_main_add_notifier(NC_SCENE|ND_NODES, NULL);
+	WM_main_add_notifier(NC_SCENE | ND_NODES, NULL);
 }
 
 void ED_node_tree_push(SpaceNode *snode, bNodeTree *ntree, bNode *gnode)
@@ -111,7 +111,7 @@ void ED_node_tree_push(SpaceNode *snode, bNodeTree *ntree, bNode *gnode)
 	snode->edittree = ntree;
 	
 	/* listener updates the View2D center from edittree */
-	WM_main_add_notifier(NC_SCENE|ND_NODES, NULL);
+	WM_main_add_notifier(NC_SCENE | ND_NODES, NULL);
 }
 
 void ED_node_tree_pop(SpaceNode *snode)
@@ -130,7 +130,7 @@ void ED_node_tree_pop(SpaceNode *snode)
 	snode->edittree = path->nodetree;
 	
 	/* listener updates the View2D center from edittree */
-	WM_main_add_notifier(NC_SCENE|ND_NODES, NULL);
+	WM_main_add_notifier(NC_SCENE | ND_NODES, NULL);
 }
 
 int ED_node_tree_depth(SpaceNode *snode)
@@ -142,7 +142,7 @@ bNodeTree *ED_node_tree_get(SpaceNode *snode, int level)
 {
 	bNodeTreePath *path;
 	int i;
-	for (path = snode->treepath.last, i = 0; path; path=path->prev, ++i) {
+	for (path = snode->treepath.last, i = 0; path; path = path->prev, ++i) {
 		if (i == level)
 			return path->nodetree;
 	}
@@ -154,7 +154,7 @@ int ED_node_tree_path_length(SpaceNode *snode)
 	bNodeTreePath *path;
 	int length = 0;
 	int i;
-	for (path=snode->treepath.first, i=0; path; path=path->next, ++i) {
+	for (path = snode->treepath.first, i = 0; path; path = path->next, ++i) {
 		length += strlen(path->node_name);
 		if (i > 0)
 			length += 1;	/* for separator char */
@@ -168,7 +168,7 @@ void ED_node_tree_path_get(SpaceNode *snode, char *value)
 	int i;
 	
 	value[0] = '\0';
-	for (path=snode->treepath.first, i=0; path; path=path->next, ++i) {
+	for (path = snode->treepath.first, i = 0; path; path = path->next, ++i) {
 		if (i == 0) {
 			strcpy(value, path->node_name);
 			value += strlen(path->node_name);
@@ -186,7 +186,7 @@ void ED_node_tree_path_get_fixedbuf(SpaceNode *snode, char *value, int max_lengt
 	int size, i;
 	
 	value[0] = '\0';
-	for (path=snode->treepath.first, i=0; path; path=path->next, ++i) {
+	for (path = snode->treepath.first, i = 0; path; path = path->next, ++i) {
 		if (i == 0) {
 			BLI_strncpy(value, path->node_name, max_length);
 			size = strlen(path->node_name);
@@ -337,10 +337,10 @@ static SpaceLink *node_new(const bContext *UNUSED(C))
 
 static void node_free(SpaceLink *sl)
 {
-	SpaceNode *snode = (SpaceNode*)sl;
+	SpaceNode *snode = (SpaceNode *)sl;
 	bNodeTreePath *path, *path_next;
 
-	for (path=snode->treepath.first; path; path=path_next) {
+	for (path = snode->treepath.first; path; path = path_next) {
 		path_next = path->next;
 		MEM_freeN(path);
 	}
@@ -521,7 +521,7 @@ static void node_area_refresh(const struct bContext *C, ScrArea *sa)
 
 static SpaceLink *node_duplicate(SpaceLink *sl)
 {
-	SpaceNode *snode = (SpaceNode*)sl;
+	SpaceNode *snode = (SpaceNode *)sl;
 	SpaceNode *snoden = MEM_dupallocN(snode);
 
 	/* clear or remove stuff from old */
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index d18ec225c5f..e27f00de748 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -2041,11 +2041,11 @@ static void draw_dupli_objects_color(Scene *scene, ARegion *ar, View3D *v3d, Bas
 			    (dob->type == OB_DUPLIGROUP && dob->animated) ||
 			    !(bb_tmp = BKE_object_boundbox_get(dob->ob)))
 			{
-				// printf("draw_dupli_objects_color: skipping displist for %s\n", dob->ob->id.name+2);
+				// printf("draw_dupli_objects_color: skipping displist for %s\n", dob->ob->id.name + 2);
 				use_displist = FALSE;
 			}
 			else {
-				// printf("draw_dupli_objects_color: using displist for %s\n", dob->ob->id.name+2);
+				// printf("draw_dupli_objects_color: using displist for %s\n", dob->ob->id.name + 2);
 				bb = *bb_tmp; /* must make a copy  */
 
 				/* disable boundbox check for list creation */
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c
index fc3bf75e784..e153651caca 100644
--- a/source/blender/gpu/intern/gpu_draw.c
+++ b/source/blender/gpu/intern/gpu_draw.c
@@ -1264,7 +1264,7 @@ static void gpu_material_to_fixed(GPUMaterialFixed *smat, const Material *bmat,
 static Material *gpu_active_node_material(Material *ma)
 {
 	if (ma && ma->use_nodes && ma->nodetree) {
-		bNode *node= nodeGetActiveID(ma->nodetree, ID_MA);
+		bNode *node = nodeGetActiveID(ma->nodetree, ID_MA);
 
 		if (node)
 			return (Material *)node->id;
diff --git a/source/blender/makesrna/RNA_enum_types.h b/source/blender/makesrna/RNA_enum_types.h
index 2719ae889d4..b6ae2b87743 100644
--- a/source/blender/makesrna/RNA_enum_types.h
+++ b/source/blender/makesrna/RNA_enum_types.h
@@ -140,12 +140,12 @@ EnumPropertyItem *rna_node_tree_type_itemf(void *data, int (*poll)(void *data, s
 int rna_node_type_to_enum(struct bNodeType *typeinfo);
 int rna_node_idname_to_enum(const char *idname);
 struct bNodeType *rna_node_type_from_enum(int value);
-EnumPropertyItem *rna_node_type_itemf(void *data, int (*poll)(void *data, struct bNodeType*), int *free);
+EnumPropertyItem *rna_node_type_itemf(void *data, int (*poll)(void *data, struct bNodeType *), int *free);
 
 int rna_node_socket_type_to_enum(struct bNodeSocketType *typeinfo);
 int rna_node_socket_idname_to_enum(const char *idname);
 struct bNodeSocketType *rna_node_socket_type_from_enum(int value);
-EnumPropertyItem *rna_node_socket_type_itemf(void *data, int (*poll)(void *data, struct bNodeSocketType*), int *free);
+EnumPropertyItem *rna_node_socket_type_itemf(void *data, int (*poll)(void *data, struct bNodeSocketType *), int *free);
 
 extern EnumPropertyItem node_socket_in_out_items[];
 extern EnumPropertyItem node_icon_items[];
diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c
index 61e67ad3298..02cacb00bec 100644
--- a/source/blender/makesrna/intern/rna_define.c
+++ b/source/blender/makesrna/intern/rna_define.c
@@ -506,7 +506,7 @@ void RNA_identifier_sanitize(char *identifier, int property)
 			/* this keyword is reserved by python.
 			 * just replace the last character by '_' to keep it readable.
 			 */
-			identifier[strlen(identifier)-1] = '_';
+			identifier[strlen(identifier) - 1] = '_';
 			break;
 		}
 	}
@@ -523,7 +523,7 @@ void RNA_identifier_sanitize(char *identifier, int property)
 				/* this keyword is reserved by python.
 				* just replace the last character by '_' to keep it readable.
 				*/
-				identifier[strlen(identifier)-1] = '_';
+				identifier[strlen(identifier) - 1] = '_';
 				break;
 			}
 		}
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index 57ae217cff6..8936609c7db 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -274,7 +274,7 @@ static void rna_Material_use_diffuse_ramp_set(PointerRNA *ptr, int value)
 	else ma->mode &= ~MA_RAMP_COL;
 
 	if ((ma->mode & MA_RAMP_COL) && ma->ramp_col == NULL)
-		ma->ramp_col = add_colorband(0);
+		ma->ramp_col = add_colorband(false);
 }
 
 static void rna_Material_use_specular_ramp_set(PointerRNA *ptr, int value)
@@ -285,7 +285,7 @@ static void rna_Material_use_specular_ramp_set(PointerRNA *ptr, int value)
 	else ma->mode &= ~MA_RAMP_SPEC;
 
 	if ((ma->mode & MA_RAMP_SPEC) && ma->ramp_spec == NULL)
-		ma->ramp_spec = add_colorband(0);
+		ma->ramp_spec = add_colorband(false);
 }
 
 static void rna_Material_use_nodes_update(bContext *C, PointerRNA *ptr)
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 99b4f5a794d..277f3251042 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -102,7 +102,7 @@ EnumPropertyItem node_chunksize_items[] = {
 #define DEF_VICO(name)
 EnumPropertyItem node_icon_items[] = {
 #include "UI_icons.h"
-		{0, NULL, 0, NULL, NULL}};
+	{0, NULL, 0, NULL, NULL}};
 #undef DEF_ICON_BLANK_SKIP
 #undef DEF_ICON
 #undef DEF_VICO
@@ -208,7 +208,7 @@ EnumPropertyItem prop_wave_items[] = {
 
 int rna_node_tree_type_to_enum(bNodeTreeType *typeinfo)
 {
-	int i=0, result=-1;
+	int i = 0, result = -1;
 	NODE_TREE_TYPES_BEGIN(nt)
 		if (nt == typeinfo) {
 			result = i;
@@ -221,9 +221,9 @@ int rna_node_tree_type_to_enum(bNodeTreeType *typeinfo)
 
 int rna_node_tree_idname_to_enum(const char *idname)
 {
-	int i=0, result=-1;
+	int i = 0, result = -1;
 	NODE_TREE_TYPES_BEGIN(nt)
-		if (strcmp(nt->idname, idname)==0) {
+		if (STREQ(nt->idname, idname)) {
 			result = i;
 			break;
 		}
@@ -234,8 +234,8 @@ int rna_node_tree_idname_to_enum(const char *idname)
 
 bNodeTreeType *rna_node_tree_type_from_enum(int value)
 {
-	int i=0;
-	bNodeTreeType *result=NULL;
+	int i = 0;
+	bNodeTreeType *result = NULL;
 	NODE_TREE_TYPES_BEGIN(nt)
 		if (i == value) {
 			result = nt;
@@ -250,7 +250,7 @@ EnumPropertyItem *rna_node_tree_type_itemf(void *data, int (*poll)(void *data, b
 {
 	EnumPropertyItem tmp = {0, "", 0, "", ""};
 	EnumPropertyItem *item = NULL;
-	int totitem=0, i=0;
+	int totitem = 0, i = 0;
 	
 	NODE_TREE_TYPES_BEGIN(nt)
 		if (poll && !poll(data, nt)) {
@@ -277,9 +277,9 @@ EnumPropertyItem *rna_node_tree_type_itemf(void *data, int (*poll)(void *data, b
 
 int rna_node_type_to_enum(bNodeType *typeinfo)
 {
-	int i=0, result=-1;
+	int i = 0, result = -1;
 	NODE_TYPES_BEGIN(ntype)
-		if (ntype==typeinfo) {
+		if (ntype == typeinfo) {
 			result = i;
 			break;
 		}
@@ -290,9 +290,9 @@ int rna_node_type_to_enum(bNodeType *typeinfo)
 
 int rna_node_idname_to_enum(const char *idname)
 {
-	int i=0, result=-1;
+	int i = 0, result = -1;
 	NODE_TYPES_BEGIN(ntype)
-		if (strcmp(ntype->idname, idname)==0) {
+		if (STREQ(ntype->idname, idname)) {
 			result = i;
 			break;
 		}
@@ -303,10 +303,10 @@ int rna_node_idname_to_enum(const char *idname)
 
 bNodeType *rna_node_type_from_enum(int value)
 {
-	int i=0;
-	bNodeType *result=NULL;
+	int i = 0;
+	bNodeType *result = NULL;
 	NODE_TYPES_BEGIN(ntype)
-		if (i==value) {
+		if (i == value) {
 			result = ntype;
 			break;
 		}
@@ -319,7 +319,7 @@ EnumPropertyItem *rna_node_type_itemf(void *data, int (*poll)(void *data, bNodeT
 {
 	EnumPropertyItem *item = NULL;
 	EnumPropertyItem tmp = {0, "", 0, "", ""};
-	int totitem=0, i=0;
+	int totitem = 0, i = 0;
 	
 	NODE_TYPES_BEGIN(ntype)
 		if (poll && !poll(data, ntype)) {
@@ -345,9 +345,9 @@ EnumPropertyItem *rna_node_type_itemf(void *data, int (*poll)(void *data, bNodeT
 
 int rna_node_socket_type_to_enum(bNodeSocketType *typeinfo)
 {
-	int i=0, result=-1;
+	int i = 0, result = -1;
 	NODE_SOCKET_TYPES_BEGIN(stype)
-		if (stype==typeinfo) {
+		if (stype == typeinfo) {
 			result = i;
 			break;
 		}
@@ -358,9 +358,9 @@ int rna_node_socket_type_to_enum(bNodeSocketType *typeinfo)
 
 int rna_node_socket_idname_to_enum(const char *idname)
 {
-	int i=0, result=-1;
+	int i = 0, result = -1;
 	NODE_SOCKET_TYPES_BEGIN(stype)
-		if (strcmp(stype->idname, idname)==0) {
+		if (STREQ(stype->idname, idname)) {
 			result = i;
 			break;
 		}
@@ -371,10 +371,10 @@ int rna_node_socket_idname_to_enum(const char *idname)
 
 bNodeSocketType *rna_node_socket_type_from_enum(int value)
 {
-	int i=0;
-	bNodeSocketType *result=NULL;
+	int i = 0;
+	bNodeSocketType *result = NULL;
 	NODE_SOCKET_TYPES_BEGIN(stype)
-		if (i==value) {
+		if (i == value) {
 			result = stype;
 			break;
 		}
@@ -387,7 +387,7 @@ EnumPropertyItem *rna_node_socket_type_itemf(void *data, int (*poll)(void *data,
 {
 	EnumPropertyItem *item = NULL;
 	EnumPropertyItem tmp = {0, "", 0, "", ""};
-	int totitem=0, i=0;
+	int totitem = 0, i = 0;
 	StructRNA *srna;
 	
 	NODE_SOCKET_TYPES_BEGIN(stype)
@@ -417,7 +417,7 @@ static EnumPropertyItem *rna_node_static_type_itemf(bContext *UNUSED(C), Pointer
 {
 	EnumPropertyItem *item = NULL;
 	EnumPropertyItem tmp;
-	int totitem=0;
+	int totitem = 0;
 	
 	/* hack, don't want to add include path to RNA just for this, since in the future RNA types
 	 * for nodes should be defined locally at runtime anyway ...
@@ -438,7 +438,7 @@ static EnumPropertyItem *rna_node_static_type_itemf(bContext *UNUSED(C), Pointer
 	RNA_enum_item_add(&item, &totitem, &tmp);
 	
 	#define DefNode(Category, ID, DefFunc, EnumName, StructName, UIName, UIDesc) \
-	if (strcmp(#Category, "Node")==0) { \
+	if (STREQ(#Category, "Node")) { \
 		tmp.value = ID; \
 		tmp.identifier = EnumName; \
 		tmp.name = UIName; \
@@ -451,7 +451,7 @@ static EnumPropertyItem *rna_node_static_type_itemf(bContext *UNUSED(C), Pointer
 	
 	if (RNA_struct_is_a(ptr->type, &RNA_ShaderNode)) {
 		#define DefNode(Category, ID, DefFunc, EnumName, StructName, UIName, UIDesc) \
-		if (strcmp(#Category, "ShaderNode")==0) { \
+		if (STREQ(#Category, "ShaderNode")) { \
 			tmp.value = ID; \
 			tmp.identifier = EnumName; \
 			tmp.name = UIName; \
@@ -465,7 +465,7 @@ static EnumPropertyItem *rna_node_static_type_itemf(bContext *UNUSED(C), Pointer
 
 	if (RNA_struct_is_a(ptr->type, &RNA_CompositorNode)) {
 		#define DefNode(Category, ID, DefFunc, EnumName, StructName, UIName, UIDesc) \
-		if (strcmp(#Category, "CompositorNode")==0) { \
+		if (STREQ(#Category, "CompositorNode")) { \
 			tmp.value = ID; \
 			tmp.identifier = EnumName; \
 			tmp.name = UIName; \
@@ -479,7 +479,7 @@ static EnumPropertyItem *rna_node_static_type_itemf(bContext *UNUSED(C), Pointer
 	
 	if (RNA_struct_is_a(ptr->type, &RNA_TextureNode)) {
 		#define DefNode(Category, ID, DefFunc, EnumName, StructName, UIName, UIDesc) \
-		if (strcmp(#Category, "TextureNode")==0) { \
+		if (STREQ(#Category, "TextureNode")) { \
 			tmp.value = ID; \
 			tmp.identifier = EnumName; \
 			tmp.name = UIName; \
@@ -501,7 +501,7 @@ static EnumPropertyItem *rna_node_static_type_itemf(bContext *UNUSED(C), Pointer
 
 static StructRNA *rna_NodeTree_refine(struct PointerRNA *ptr)
 {
-	bNodeTree *ntree= (bNodeTree*)ptr->data;
+	bNodeTree *ntree = (bNodeTree *)ptr->data;
 	
 	if (ntree->typeinfo && ntree->typeinfo->ext.srna)
 		return ntree->typeinfo->ext.srna;
@@ -527,7 +527,7 @@ static int rna_NodeTree_poll(const bContext *C, bNodeTreeType *ntreetype)
 	ntreetype->ext.call((bContext *)C, &ptr, func, &list);
 
 	RNA_parameter_get_lookup(&list, "visible", &ret);
-	visible = *(int*)ret;
+	visible = *(int *)ret;
 
 	RNA_parameter_list_free(&list);
 
@@ -585,11 +585,11 @@ static void rna_NodeTree_get_from_context(const bContext *C, bNodeTreeType *ntre
 
 static void rna_NodeTree_unregister(Main *UNUSED(bmain), StructRNA *type)
 {
-	bNodeTreeType *nt= RNA_struct_blender_type_get(type);
+	bNodeTreeType *nt = RNA_struct_blender_type_get(type);
 
-	if(!nt)
+	if (!nt)
 		return;
-	
+
 	RNA_struct_free_extension(type, &nt->ext);
 
 	ntreeTypeFreeLink(nt);
@@ -597,7 +597,7 @@ static void rna_NodeTree_unregister(Main *UNUSED(bmain), StructRNA *type)
 	RNA_struct_free(&BLENDER_RNA, type);
 
 	/* update while blender is running */
-	WM_main_add_notifier(NC_NODE|NA_EDITED, NULL);
+	WM_main_add_notifier(NC_NODE | NA_EDITED, NULL);
 }
 
 static StructRNA *rna_NodeTree_register(Main *bmain, ReportList *reports, void *data, const char *identifier,
@@ -611,34 +611,34 @@ static StructRNA *rna_NodeTree_register(Main *bmain, ReportList *reports, void *
 	/* setup dummy tree & tree type to store static properties in */
 	memset(&dummynt, 0, sizeof(bNodeTreeType));
 	memset(&dummyntree, 0, sizeof(bNodeTree));
-	dummyntree.typeinfo= &dummynt;
+	dummyntree.typeinfo = &dummynt;
 	RNA_pointer_create(NULL, &RNA_NodeTree, &dummyntree, &dummyptr);
 
 	/* validate the python class */
-	if(validate(&dummyptr, data, have_function) != 0)
+	if (validate(&dummyptr, data, have_function) != 0)
 		return NULL;
-	
-	if(strlen(identifier) >= sizeof(dummynt.idname)) {
+
+	if (strlen(identifier) >= sizeof(dummynt.idname)) {
 		BKE_reportf(reports, RPT_ERROR, "registering node tree class: '%s' is too long, maximum length is %d",
 		            identifier, (int)sizeof(dummynt.idname));
 		return NULL;
 	}
 
 	/* check if we have registered this tree type before, and remove it */
-	nt= ntreeTypeFind(dummynt.idname);
-	if(nt)
+	nt = ntreeTypeFind(dummynt.idname);
+	if (nt)
 		rna_NodeTree_unregister(bmain, nt->ext.srna);
 	
 	/* create a new node tree type */
-	nt= MEM_callocN(sizeof(bNodeTreeType), "node tree type");
+	nt = MEM_callocN(sizeof(bNodeTreeType), "node tree type");
 	memcpy(nt, &dummynt, sizeof(dummynt));
 
 	nt->type = NTREE_CUSTOM;
 
-	nt->ext.srna= RNA_def_struct_ptr(&BLENDER_RNA, nt->idname, &RNA_NodeTree); 
-	nt->ext.data= data;
-	nt->ext.call= call;
-	nt->ext.free= free;
+	nt->ext.srna = RNA_def_struct_ptr(&BLENDER_RNA, nt->idname, &RNA_NodeTree); 
+	nt->ext.data = data;
+	nt->ext.call = call;
+	nt->ext.free = free;
 	RNA_struct_blender_type_set(nt->ext.srna, nt);
 
 	RNA_def_struct_ui_text(nt->ext.srna, nt->ui_name, nt->ui_description);
@@ -651,7 +651,7 @@ static StructRNA *rna_NodeTree_register(Main *bmain, ReportList *reports, void *
 	ntreeTypeAdd(nt);
 
 	/* update while blender is running */
-	WM_main_add_notifier(NC_NODE|NA_EDITED, NULL);
+	WM_main_add_notifier(NC_NODE | NA_EDITED, NULL);
 	
 	return nt->ext.srna;
 }
@@ -696,7 +696,7 @@ static bNode *rna_NodeTree_node_new(bNodeTree *ntree, bContext *C, ReportList *r
 	bNode *node;
 	
 	if (!ntreeIsValid(ntree)) {
-		BKE_reportf(reports, RPT_ERROR, "Node tree %s invalid", ntree->id.name+2);
+		BKE_reportf(reports, RPT_ERROR, "Node tree %s invalid", ntree->id.name + 2);
 		return NULL;
 	}
 	
@@ -707,7 +707,7 @@ static bNode *rna_NodeTree_node_new(bNodeTree *ntree, bContext *C, ReportList *r
 	}
 	
 	if (ntype->poll && !ntype->poll(ntype, ntree)) {
-		BKE_reportf(reports, RPT_ERROR, "Cannot add node of type %s to node tree '%s'", type, ntree->id.name+2);
+		BKE_reportf(reports, RPT_ERROR, "Cannot add node of type %s to node tree '%s'", type, ntree->id.name + 2);
 		return NULL;
 	}
 	
@@ -715,22 +715,22 @@ static bNode *rna_NodeTree_node_new(bNodeTree *ntree, bContext *C, ReportList *r
 	BLI_assert(node && node->typeinfo);
 	
 	/* XXX ugly stuff, should be done with specialized operators (after actual node creation)! */
-	if (ntree->type==NTREE_COMPOSIT) {
-		if(ELEM4(node->type, CMP_NODE_COMPOSITE, CMP_NODE_DEFOCUS, CMP_NODE_OUTPUT_FILE, CMP_NODE_R_LAYERS)) {
+	if (ntree->type == NTREE_COMPOSIT) {
+		if (ELEM4(node->type, CMP_NODE_COMPOSITE, CMP_NODE_DEFOCUS, CMP_NODE_OUTPUT_FILE, CMP_NODE_R_LAYERS)) {
 			/* annoying, find the node tree we are in, scene can be NULL */
 			Scene *scene;
-			for(scene= CTX_data_main(C)->scene.first; scene; scene= scene->id.next) {
-				if(scene->nodetree == ntree) {
+			for (scene = CTX_data_main(C)->scene.first; scene; scene = scene->id.next) {
+				if (scene->nodetree == ntree) {
 					break;
 				}
 			}
-			node->id= (ID *)scene;
+			node->id = (ID *)scene;
 			id_us_plus(node->id);
 		}
 		
 		ntreeCompositForceHidden(ntree, CTX_data_scene(C));
 	}
-	else if (ntree->type==NTREE_TEXTURE) {
+	else if (ntree->type == NTREE_TEXTURE) {
 		ntreeTexCheckCyclics(ntree);
 	}
 	
@@ -746,7 +746,7 @@ static void rna_NodeTree_node_remove(bNodeTree *ntree, ReportList *reports, Poin
 	bNode *node = node_ptr->data;
 	
 	if (!ntreeIsValid(ntree)) {
-		BKE_reportf(reports, RPT_ERROR, "Node tree %s invalid", ntree->id.name+2);
+		BKE_reportf(reports, RPT_ERROR, "Node tree %s invalid", ntree->id.name + 2);
 		return;
 	}
 	
@@ -768,7 +768,7 @@ static void rna_NodeTree_node_clear(bNodeTree *ntree, ReportList *reports)
 	bNode *node = ntree->nodes.first;
 
 	if (!ntreeIsValid(ntree)) {
-		BKE_reportf(reports, RPT_ERROR, "Node tree %s invalid", ntree->id.name+2);
+		BKE_reportf(reports, RPT_ERROR, "Node tree %s invalid", ntree->id.name + 2);
 		return;
 	}
 
@@ -818,7 +818,7 @@ static bNodeLink *rna_NodeTree_link_new(bNodeTree *ntree, ReportList *reports,
 	bNode *fromnode = NULL, *tonode = NULL;
 
 	if (!ntreeIsValid(ntree)) {
-		BKE_reportf(reports, RPT_ERROR, "Node tree %s invalid", ntree->id.name+2);
+		BKE_reportf(reports, RPT_ERROR, "Node tree %s invalid", ntree->id.name + 2);
 		return NULL;
 	}
 
@@ -856,7 +856,7 @@ static void rna_NodeTree_link_remove(bNodeTree *ntree, ReportList *reports, Poin
 	bNodeLink *link = link_ptr->data;
 
 	if (!ntreeIsValid(ntree)) {
-		BKE_reportf(reports, RPT_ERROR, "Node tree %s invalid", ntree->id.name+2);
+		BKE_reportf(reports, RPT_ERROR, "Node tree %s invalid", ntree->id.name + 2);
 		return;
 	}
 
@@ -877,7 +877,7 @@ static void rna_NodeTree_link_clear(bNodeTree *ntree, ReportList *reports)
 	bNodeLink *link = ntree->links.first;
 
 	if (!ntreeIsValid(ntree)) {
-		BKE_reportf(reports, RPT_ERROR, "Node tree %s invalid", ntree->id.name+2);
+		BKE_reportf(reports, RPT_ERROR, "Node tree %s invalid", ntree->id.name + 2);
 		return;
 	}
 
@@ -895,7 +895,7 @@ static void rna_NodeTree_link_clear(bNodeTree *ntree, ReportList *reports)
 
 static int rna_NodeTree_active_input_get(PointerRNA *ptr)
 {
-	bNodeTree *ntree = (bNodeTree*)ptr->data;
+	bNodeTree *ntree = (bNodeTree *)ptr->data;
 	bNodeSocket *gsock;
 	int index;
 
@@ -907,7 +907,7 @@ static int rna_NodeTree_active_input_get(PointerRNA *ptr)
 
 static void rna_NodeTree_active_input_set(PointerRNA *ptr, int value)
 {
-	bNodeTree *ntree = (bNodeTree*)ptr->data;
+	bNodeTree *ntree = (bNodeTree *)ptr->data;
 	bNodeSocket *gsock;
 	int index;
 	
@@ -924,7 +924,7 @@ static void rna_NodeTree_active_input_set(PointerRNA *ptr, int value)
 
 static int rna_NodeTree_active_output_get(PointerRNA *ptr)
 {
-	bNodeTree *ntree = (bNodeTree*)ptr->data;
+	bNodeTree *ntree = (bNodeTree *)ptr->data;
 	bNodeSocket *gsock;
 	int index;
 
@@ -936,7 +936,7 @@ static int rna_NodeTree_active_output_get(PointerRNA *ptr)
 
 static void rna_NodeTree_active_output_set(PointerRNA *ptr, int value)
 {
-	bNodeTree *ntree = (bNodeTree*)ptr->data;
+	bNodeTree *ntree = (bNodeTree *)ptr->data;
 	bNodeSocket *gsock;
 	int index;
 	
@@ -972,14 +972,14 @@ static bNodeSocket *rna_NodeTree_inputs_new(bNodeTree *ntree, ReportList *report
 	bNodeSocket *sock;
 	
 	if (!ntreeIsValid(ntree)) {
-		BKE_reportf(reports, RPT_ERROR, "Node tree %s invalid", ntree->id.name+2);
+		BKE_reportf(reports, RPT_ERROR, "Node tree %s invalid", ntree->id.name + 2);
 		return NULL;
 	}
 	
 	sock = ntreeAddSocketInterface(ntree, SOCK_IN, type, name);
 	
 	ntreeUpdateTree(ntree);
-	WM_main_add_notifier(NC_NODE|NA_EDITED, ntree);
+	WM_main_add_notifier(NC_NODE | NA_EDITED, ntree);
 	
 	return sock;
 }
@@ -989,14 +989,14 @@ static bNodeSocket *rna_NodeTree_outputs_new(bNodeTree *ntree, ReportList *repor
 	bNodeSocket *sock;
 	
 	if (!ntreeIsValid(ntree)) {
-		BKE_reportf(reports, RPT_ERROR, "Node tree %s invalid", ntree->id.name+2);
+		BKE_reportf(reports, RPT_ERROR, "Node tree %s invalid", ntree->id.name + 2);
 		return NULL;
 	}
 	
 	sock = ntreeAddSocketInterface(ntree, SOCK_OUT, type, name);
 	
 	ntreeUpdateTree(ntree);
-	WM_main_add_notifier(NC_NODE|NA_EDITED, ntree);
+	WM_main_add_notifier(NC_NODE | NA_EDITED, ntree);
 	
 	return sock;
 }
@@ -1004,7 +1004,7 @@ static bNodeSocket *rna_NodeTree_outputs_new(bNodeTree *ntree, ReportList *repor
 static void rna_NodeTree_socket_remove(bNodeTree *ntree, ReportList *reports, bNodeSocket *sock)
 {
 	if (!ntreeIsValid(ntree)) {
-		BKE_reportf(reports, RPT_ERROR, "Node tree %s invalid", ntree->id.name+2);
+		BKE_reportf(reports, RPT_ERROR, "Node tree %s invalid", ntree->id.name + 2);
 		return;
 	}
 	
@@ -1015,7 +1015,7 @@ static void rna_NodeTree_socket_remove(bNodeTree *ntree, ReportList *reports, bN
 		ntreeRemoveSocketInterface(ntree, sock);
 		
 		ntreeUpdateTree(ntree);
-		WM_main_add_notifier(NC_NODE|NA_EDITED, ntree);
+		WM_main_add_notifier(NC_NODE | NA_EDITED, ntree);
 	}
 }
 
@@ -1024,7 +1024,7 @@ static void rna_NodeTree_inputs_clear(bNodeTree *ntree, ReportList *reports)
 	bNodeSocket *sock, *nextsock;
 	
 	if (!ntreeIsValid(ntree)) {
-		BKE_reportf(reports, RPT_ERROR, "Node tree %s invalid", ntree->id.name+2);
+		BKE_reportf(reports, RPT_ERROR, "Node tree %s invalid", ntree->id.name + 2);
 		return;
 	}
 	
@@ -1034,7 +1034,7 @@ static void rna_NodeTree_inputs_clear(bNodeTree *ntree, ReportList *reports)
 	}
 
 	ntreeUpdateTree(ntree);
-	WM_main_add_notifier(NC_NODE|NA_EDITED, ntree);
+	WM_main_add_notifier(NC_NODE | NA_EDITED, ntree);
 }
 
 static void rna_NodeTree_outputs_clear(bNodeTree *ntree, ReportList *reports)
@@ -1042,7 +1042,7 @@ static void rna_NodeTree_outputs_clear(bNodeTree *ntree, ReportList *reports)
 	bNodeSocket *sock, *nextsock;
 	
 	if (!ntreeIsValid(ntree)) {
-		BKE_reportf(reports, RPT_ERROR, "Node tree %s invalid", ntree->id.name+2);
+		BKE_reportf(reports, RPT_ERROR, "Node tree %s invalid", ntree->id.name + 2);
 		return;
 	}
 	
@@ -1052,7 +1052,7 @@ static void rna_NodeTree_outputs_clear(bNodeTree *ntree, ReportList *reports)
 	}
 
 	ntreeUpdateTree(ntree);
-	WM_main_add_notifier(NC_NODE|NA_EDITED, ntree);
+	WM_main_add_notifier(NC_NODE | NA_EDITED, ntree);
 }
 
 static void rna_NodeTree_interface_update(bNodeTree *ntree, bContext *C)
@@ -1150,7 +1150,7 @@ static StructRNA *rna_Node_refine(struct PointerRNA *ptr)
 
 static char *rna_Node_path(PointerRNA *ptr)
 {
-	bNode *node = (bNode*)ptr->data;
+	bNode *node = (bNode *)ptr->data;
 
 	return BLI_sprintfN("nodes[\"%s\"]", node->name);
 }
@@ -1173,7 +1173,7 @@ static int rna_Node_poll(bNodeType *ntype, bNodeTree *ntree)
 	ntype->ext.call(NULL, &ptr, func, &list);
 
 	RNA_parameter_get_lookup(&list, "visible", &ret);
-	visible = *(int*)ret;
+	visible = *(int *)ret;
 
 	RNA_parameter_list_free(&list);
 
@@ -1201,7 +1201,7 @@ static int rna_Node_poll_instance(bNode *node, bNodeTree *ntree)
 	node->typeinfo->ext.call(NULL, &ptr, func, &list);
 
 	RNA_parameter_get_lookup(&list, "visible", &ret);
-	visible = *(int*)ret;
+	visible = *(int *)ret;
 
 	RNA_parameter_list_free(&list);
 
@@ -1350,11 +1350,11 @@ static void rna_Node_is_registered_node_type_runtime(bContext *UNUSED(C), Report
 
 static void rna_Node_unregister(Main *UNUSED(bmain), StructRNA *type)
 {
-	bNodeType *nt= RNA_struct_blender_type_get(type);
+	bNodeType *nt = RNA_struct_blender_type_get(type);
 
-	if(!nt)
+	if (!nt)
 		return;
-	
+
 	RNA_struct_free_extension(type, &nt->ext);
 
 	/* this also frees the allocated nt pointer, no MEM_free call needed! */
@@ -1363,7 +1363,7 @@ static void rna_Node_unregister(Main *UNUSED(bmain), StructRNA *type)
 	RNA_struct_free(&BLENDER_RNA, type);
 
 	/* update while blender is running */
-	WM_main_add_notifier(NC_NODE|NA_EDITED, NULL);
+	WM_main_add_notifier(NC_NODE | NA_EDITED, NULL);
 }
 
 /* Generic internal registration function.
@@ -1386,34 +1386,34 @@ static bNodeType *rna_Node_register_base(Main *bmain, ReportList *reports, Struc
 	node_type_base_custom(&dummynt, identifier, "", 0, 0);
 
 	memset(&dummynode, 0, sizeof(bNode));
-	dummynode.typeinfo= &dummynt;
+	dummynode.typeinfo = &dummynt;
 	RNA_pointer_create(NULL, basetype, &dummynode, &dummyptr);
 
 	/* validate the python class */
-	if(validate(&dummyptr, data, have_function) != 0)
+	if (validate(&dummyptr, data, have_function) != 0)
 		return NULL;
-	
-	if(strlen(identifier) >= sizeof(dummynt.idname)) {
+
+	if (strlen(identifier) >= sizeof(dummynt.idname)) {
 		BKE_reportf(reports, RPT_ERROR, "registering node class: '%s' is too long, maximum length is %d",
 		            identifier, (int)sizeof(dummynt.idname));
 		return NULL;
 	}
 
 	/* check if we have registered this node type before, and remove it */
-	nt= nodeTypeFind(dummynt.idname);
-	if(nt)
+	nt = nodeTypeFind(dummynt.idname);
+	if (nt)
 		rna_Node_unregister(bmain, nt->ext.srna);
 	
 	/* create a new node type */
-	nt= MEM_callocN(sizeof(bNodeType), "node type");
+	nt = MEM_callocN(sizeof(bNodeType), "node type");
 	memcpy(nt, &dummynt, sizeof(dummynt));
 	/* make sure the node type struct is freed on unregister */
 	nt->needs_free = 1;
 
-	nt->ext.srna= RNA_def_struct_ptr(&BLENDER_RNA, nt->idname, basetype);
-	nt->ext.data= data;
-	nt->ext.call= call;
-	nt->ext.free= free;
+	nt->ext.srna = RNA_def_struct_ptr(&BLENDER_RNA, nt->idname, basetype);
+	nt->ext.data = data;
+	nt->ext.call = call;
+	nt->ext.free = free;
 	RNA_struct_blender_type_set(nt->ext.srna, nt);
 
 	RNA_def_struct_ui_text(nt->ext.srna, nt->ui_name, nt->ui_description);
@@ -1454,7 +1454,7 @@ static StructRNA *rna_Node_register(Main *bmain, ReportList *reports,
 	nodeRegisterType(nt);
 	
 	/* update while blender is running */
-	WM_main_add_notifier(NC_NODE|NA_EDITED, NULL);
+	WM_main_add_notifier(NC_NODE | NA_EDITED, NULL);
 	
 	return nt->ext.srna;
 }
@@ -1470,7 +1470,7 @@ static StructRNA *rna_NodeGroup_register(Main *bmain, ReportList *reports,
 	nodeRegisterType(nt);
 	
 	/* update while blender is running */
-	WM_main_add_notifier(NC_NODE|NA_EDITED, NULL);
+	WM_main_add_notifier(NC_NODE | NA_EDITED, NULL);
 	
 	return nt->ext.srna;
 }
@@ -1486,7 +1486,7 @@ static StructRNA *rna_ShaderNode_register(Main *bmain, ReportList *reports,
 	nodeRegisterType(nt);
 	
 	/* update while blender is running */
-	WM_main_add_notifier(NC_NODE|NA_EDITED, NULL);
+	WM_main_add_notifier(NC_NODE | NA_EDITED, NULL);
 	
 	return nt->ext.srna;
 }
@@ -1502,7 +1502,7 @@ static StructRNA *rna_CompositorNode_register(Main *bmain, ReportList *reports,
 	nodeRegisterType(nt);
 	
 	/* update while blender is running */
-	WM_main_add_notifier(NC_NODE|NA_EDITED, NULL);
+	WM_main_add_notifier(NC_NODE | NA_EDITED, NULL);
 	
 	return nt->ext.srna;
 }
@@ -1518,7 +1518,7 @@ static StructRNA *rna_TextureNode_register(Main *bmain, ReportList *reports,
 	nodeRegisterType(nt);
 	
 	/* update while blender is running */
-	WM_main_add_notifier(NC_NODE|NA_EDITED, NULL);
+	WM_main_add_notifier(NC_NODE | NA_EDITED, NULL);
 	
 	return nt->ext.srna;
 }
@@ -1578,7 +1578,7 @@ static int rna_Node_parent_poll(PointerRNA *ptr, PointerRNA value)
 
 static void rna_Node_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr)
 {
-	bNodeTree *ntree = (bNodeTree*)ptr->id.data;
+	bNodeTree *ntree = (bNodeTree *)ptr->id.data;
 	ED_node_tag_update_nodetree(bmain, ntree);
 }
 
@@ -1589,14 +1589,14 @@ static void rna_Node_socket_value_update(ID *id, bNode *UNUSED(node), bContext *
 
 static void rna_Node_select_set(PointerRNA *ptr, int value)
 {
-	bNode *node= (bNode*)ptr->data;
+	bNode *node = (bNode *)ptr->data;
 	nodeSetSelected(node, value);
 }
 
 static void rna_Node_name_set(PointerRNA *ptr, const char *value)
 {
-	bNodeTree *ntree = (bNodeTree*)ptr->id.data;
-	bNode *node = (bNode*)ptr->data;
+	bNodeTree *ntree = (bNodeTree *)ptr->id.data;
+	bNode *node = (bNode *)ptr->data;
 	char oldname[sizeof(node->name)];
 	
 	/* make a copy of the old name first */
@@ -1643,7 +1643,7 @@ static bNodeSocket *rna_Node_inputs_new(ID *id, bNode *node, ReportList *reports
 	}
 	else {
 		ntreeUpdateTree(ntree);
-		WM_main_add_notifier(NC_NODE|NA_EDITED, ntree);
+		WM_main_add_notifier(NC_NODE | NA_EDITED, ntree);
 	}
 	
 	return sock;
@@ -1666,7 +1666,7 @@ static bNodeSocket *rna_Node_outputs_new(ID *id, bNode *node, ReportList *report
 	}
 	else {
 		ntreeUpdateTree(ntree);
-		WM_main_add_notifier(NC_NODE|NA_EDITED, ntree);
+		WM_main_add_notifier(NC_NODE | NA_EDITED, ntree);
 	}
 	
 	return sock;
@@ -1688,7 +1688,7 @@ static void rna_Node_socket_remove(ID *id, bNode *node, ReportList *reports, bNo
 		nodeRemoveSocket(ntree, node, sock);
 		
 		ntreeUpdateTree(ntree);
-		WM_main_add_notifier(NC_NODE|NA_EDITED, ntree);
+		WM_main_add_notifier(NC_NODE | NA_EDITED, ntree);
 	}
 }
 
@@ -1708,7 +1708,7 @@ static void rna_Node_inputs_clear(ID *id, bNode *node, ReportList *reports)
 	}
 
 	ntreeUpdateTree(ntree);
-	WM_main_add_notifier(NC_NODE|NA_EDITED, ntree);
+	WM_main_add_notifier(NC_NODE | NA_EDITED, ntree);
 }
 
 static void rna_Node_outputs_clear(ID *id, bNode *node, ReportList *reports)
@@ -1727,7 +1727,7 @@ static void rna_Node_outputs_clear(ID *id, bNode *node, ReportList *reports)
 	}
 
 	ntreeUpdateTree(ntree);
-	WM_main_add_notifier(NC_NODE|NA_EDITED, ntree);
+	WM_main_add_notifier(NC_NODE | NA_EDITED, ntree);
 }
 
 static void rna_Node_width_range(PointerRNA *ptr, float *min, float *max, float *softmin, float *softmax)
@@ -1758,7 +1758,7 @@ static void rna_Node_height_range(PointerRNA *ptr, float *min, float *max, float
 
 static void rna_Node_bl_idname_get(PointerRNA *ptr, char *value)
 {
-	bNode *node= ptr->data;
+	bNode *node = ptr->data;
 	if (node->typeinfo)
 		strcpy(value, node->typeinfo->idname);
 	else
@@ -1775,7 +1775,7 @@ static int rna_Node_bl_idname_length(PointerRNA *ptr)
 
 static void rna_Node_bl_label_get(PointerRNA *ptr, char *value)
 {
-	bNode *node= ptr->data;
+	bNode *node = ptr->data;
 	if (node->typeinfo)
 		strcpy(value, node->typeinfo->ui_name);
 	else
@@ -1792,7 +1792,7 @@ static int rna_Node_bl_label_length(PointerRNA *ptr)
 
 static void rna_Node_bl_description_get(PointerRNA *ptr, char *value)
 {
-	bNode *node= ptr->data;
+	bNode *node = ptr->data;
 	if (node->typeinfo)
 		strcpy(value, node->typeinfo->ui_description);
 	else
@@ -1877,8 +1877,8 @@ static void rna_NodeSocket_draw_color(bContext *C, PointerRNA *ptr, PointerRNA *
 
 static void rna_NodeSocket_unregister(Main *UNUSED(bmain), StructRNA *type)
 {
-	bNodeSocketType *st= RNA_struct_blender_type_get(type);
-	if(!st)
+	bNodeSocketType *st = RNA_struct_blender_type_get(type);
+	if (!st)
 		return;
 	
 	RNA_struct_free_extension(type, &st->ext_socket);
@@ -1888,7 +1888,7 @@ static void rna_NodeSocket_unregister(Main *UNUSED(bmain), StructRNA *type)
 	RNA_struct_free(&BLENDER_RNA, type);
 
 	/* update while blender is running */
-	WM_main_add_notifier(NC_NODE|NA_EDITED, NULL);
+	WM_main_add_notifier(NC_NODE | NA_EDITED, NULL);
 }
 
 static StructRNA *rna_NodeSocket_register(Main *bmain, ReportList *reports, void *data, const char *identifier,
@@ -1903,24 +1903,24 @@ static StructRNA *rna_NodeSocket_register(Main *bmain, ReportList *reports, void
 	memset(&dummyst, 0, sizeof(bNodeSocketType));
 	
 	memset(&dummysock, 0, sizeof(bNodeSocket));
-	dummysock.typeinfo= &dummyst;
+	dummysock.typeinfo = &dummyst;
 	RNA_pointer_create(NULL, &RNA_NodeSocket, &dummysock, &dummyptr);
 
 	/* validate the python class */
-	if(validate(&dummyptr, data, have_function) != 0)
+	if (validate(&dummyptr, data, have_function) != 0)
 		return NULL;
 	
-	if(strlen(identifier) >= sizeof(dummyst.idname)) {
+	if (strlen(identifier) >= sizeof(dummyst.idname)) {
 		BKE_reportf(reports, RPT_ERROR, "registering node socket class: '%s' is too long, maximum length is %d",
 		            identifier, (int)sizeof(dummyst.idname));
 		return NULL;
 	}
 
 	/* check if we have registered this socket type before */
-	st= nodeSocketTypeFind(dummyst.idname);
+	st = nodeSocketTypeFind(dummyst.idname);
 	if (!st) {
 		/* create a new node socket type */
-		st= MEM_callocN(sizeof(bNodeSocketType), "node socket type");
+		st = MEM_callocN(sizeof(bNodeSocketType), "node socket type");
 		memcpy(st, &dummyst, sizeof(dummyst));
 		
 		nodeRegisterSocketType(st);
@@ -1932,10 +1932,10 @@ static StructRNA *rna_NodeSocket_register(Main *bmain, ReportList *reports, void
 		RNA_struct_free_extension(srna, &st->ext_socket);
 		RNA_struct_free(&BLENDER_RNA, srna);
 	}
-	st->ext_socket.srna= RNA_def_struct_ptr(&BLENDER_RNA, st->idname, &RNA_NodeSocket); 
-	st->ext_socket.data= data;
-	st->ext_socket.call= call;
-	st->ext_socket.free= free;
+	st->ext_socket.srna = RNA_def_struct_ptr(&BLENDER_RNA, st->idname, &RNA_NodeSocket); 
+	st->ext_socket.data = data;
+	st->ext_socket.call = call;
+	st->ext_socket.free = free;
 	RNA_struct_blender_type_set(st->ext_socket.srna, st);
 	
 	/* XXX bad level call! needed to initialize the basic draw functions ... */
@@ -1945,7 +1945,7 @@ static StructRNA *rna_NodeSocket_register(Main *bmain, ReportList *reports, void
 	st->draw_color = (have_function[1]) ? rna_NodeSocket_draw_color : NULL;
 
 	/* update while blender is running */
-	WM_main_add_notifier(NC_NODE|NA_EDITED, NULL);
+	WM_main_add_notifier(NC_NODE | NA_EDITED, NULL);
 	
 	return st->ext_socket.srna;
 }
@@ -2009,7 +2009,7 @@ static int rna_NodeSocket_bl_idname_length(PointerRNA *ptr)
 
 static PointerRNA rna_NodeSocket_node_get(PointerRNA *ptr)
 {
-	bNodeTree *ntree = (bNodeTree*)ptr->id.data;
+	bNodeTree *ntree = (bNodeTree *)ptr->id.data;
 	bNodeSocket *sock = (bNodeSocket *)ptr->data;
 	bNode *node;
 	PointerRNA r_ptr;
@@ -2022,7 +2022,7 @@ static PointerRNA rna_NodeSocket_node_get(PointerRNA *ptr)
 
 static void rna_NodeSocket_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr)
 {
-	bNodeTree *ntree = (bNodeTree*)ptr->id.data;
+	bNodeTree *ntree = (bNodeTree *)ptr->id.data;
 	ED_node_tag_update_nodetree(bmain, ntree);
 }
 
@@ -2158,8 +2158,8 @@ static void rna_NodeSocketInterface_from_socket(bNodeTree *ntree, bNodeSocket *s
 
 static void rna_NodeSocketInterface_unregister(Main *UNUSED(bmain), StructRNA *type)
 {
-	bNodeSocketType *st= RNA_struct_blender_type_get(type);
-	if(!st)
+	bNodeSocketType *st = RNA_struct_blender_type_get(type);
+	if (!st)
 		return;
 	
 	RNA_struct_free_extension(type, &st->ext_interface);
@@ -2167,7 +2167,7 @@ static void rna_NodeSocketInterface_unregister(Main *UNUSED(bmain), StructRNA *t
 	RNA_struct_free(&BLENDER_RNA, type);
 	
 	/* update while blender is running */
-	WM_main_add_notifier(NC_NODE|NA_EDITED, NULL);
+	WM_main_add_notifier(NC_NODE | NA_EDITED, NULL);
 }
 
 static StructRNA *rna_NodeSocketInterface_register(Main *bmain, ReportList *reports, void *data, const char *identifier,
@@ -2182,7 +2182,7 @@ static StructRNA *rna_NodeSocketInterface_register(Main *bmain, ReportList *repo
 	memset(&dummyst, 0, sizeof(bNodeSocketType));
 	
 	memset(&dummysock, 0, sizeof(bNodeSocket));
-	dummysock.typeinfo= &dummyst;
+	dummysock.typeinfo = &dummyst;
 	RNA_pointer_create(NULL, &RNA_NodeSocketInterface, &dummysock, &dummyptr);
 
 	/* validate the python class */
@@ -2190,13 +2190,13 @@ static StructRNA *rna_NodeSocketInterface_register(Main *bmain, ReportList *repo
 		return NULL;
 
 	/* check if we have registered this socket type before */
-	st= nodeSocketTypeFind(dummyst.idname);
+	st = nodeSocketTypeFind(dummyst.idname);
 	if (st) {
 		/* basic socket type registered by a socket class before. */
 	}
 	else {
 		/* create a new node socket type */
-		st= MEM_callocN(sizeof(bNodeSocketType), "node socket type");
+		st = MEM_callocN(sizeof(bNodeSocketType), "node socket type");
 		memcpy(st, &dummyst, sizeof(dummyst));
 		
 		nodeRegisterSocketType(st);
@@ -2208,10 +2208,10 @@ static StructRNA *rna_NodeSocketInterface_register(Main *bmain, ReportList *repo
 		RNA_struct_free_extension(srna, &st->ext_interface);
 		RNA_struct_free(&BLENDER_RNA, srna);
 	}
-	st->ext_interface.srna= RNA_def_struct_ptr(&BLENDER_RNA, identifier, &RNA_NodeSocketInterface); 
-	st->ext_interface.data= data;
-	st->ext_interface.call= call;
-	st->ext_interface.free= free;
+	st->ext_interface.srna = RNA_def_struct_ptr(&BLENDER_RNA, identifier, &RNA_NodeSocketInterface); 
+	st->ext_interface.data = data;
+	st->ext_interface.call = call;
+	st->ext_interface.free = free;
 	RNA_struct_blender_type_set(st->ext_interface.srna, st);
 	
 	st->interface_draw = (have_function[0]) ? rna_NodeSocketInterface_draw : NULL;
@@ -2221,7 +2221,7 @@ static StructRNA *rna_NodeSocketInterface_register(Main *bmain, ReportList *repo
 	st->interface_from_socket = (have_function[4]) ? rna_NodeSocketInterface_from_socket : NULL;
 	
 	/* update while blender is running */
-	WM_main_add_notifier(NC_NODE|NA_EDITED, NULL);
+	WM_main_add_notifier(NC_NODE | NA_EDITED, NULL);
 	
 	return st->ext_interface.srna;
 }
@@ -2555,35 +2555,35 @@ static EnumPropertyItem *rna_Node_channel_itemf(bContext *UNUSED(C), PointerRNA
 	
 	switch (node->custom1) {
 		case CMP_NODE_CHANNEL_MATTE_CS_RGB:
-			tmp.identifier = "R"; tmp.name= "R"; tmp.value= 1;
+			tmp.identifier = "R"; tmp.name = "R"; tmp.value = 1;
 			RNA_enum_item_add(&item, &totitem, &tmp);
-			tmp.identifier = "G"; tmp.name= "G"; tmp.value= 2;
+			tmp.identifier = "G"; tmp.name = "G"; tmp.value = 2;
 			RNA_enum_item_add(&item, &totitem, &tmp);
-			tmp.identifier = "B"; tmp.name= "B"; tmp.value= 3;
+			tmp.identifier = "B"; tmp.name = "B"; tmp.value = 3;
 			RNA_enum_item_add(&item, &totitem, &tmp);
 			break;
 		case CMP_NODE_CHANNEL_MATTE_CS_HSV:
-			tmp.identifier = "H"; tmp.name= "H"; tmp.value= 1;
+			tmp.identifier = "H"; tmp.name = "H"; tmp.value = 1;
 			RNA_enum_item_add(&item, &totitem, &tmp);
-			tmp.identifier = "S"; tmp.name= "S"; tmp.value= 2;
+			tmp.identifier = "S"; tmp.name = "S"; tmp.value = 2;
 			RNA_enum_item_add(&item, &totitem, &tmp);
-			tmp.identifier = "V"; tmp.name= "V"; tmp.value= 3;
+			tmp.identifier = "V"; tmp.name = "V"; tmp.value = 3;
 			RNA_enum_item_add(&item, &totitem, &tmp);
 			break;
 		case CMP_NODE_CHANNEL_MATTE_CS_YUV:
-			tmp.identifier = "Y"; tmp.name= "Y"; tmp.value= 1;
+			tmp.identifier = "Y"; tmp.name = "Y"; tmp.value = 1;
 			RNA_enum_item_add(&item, &totitem, &tmp);
-			tmp.identifier = "G"; tmp.name= "U"; tmp.value= 2;
+			tmp.identifier = "G"; tmp.name = "U"; tmp.value = 2;
 			RNA_enum_item_add(&item, &totitem, &tmp);
-			tmp.identifier = "V"; tmp.name= "V"; tmp.value= 3;
+			tmp.identifier = "V"; tmp.name = "V"; tmp.value = 3;
 			RNA_enum_item_add(&item, &totitem, &tmp);
 			break;
 		case CMP_NODE_CHANNEL_MATTE_CS_YCC:
-			tmp.identifier = "Y"; tmp.name= "Y"; tmp.value= 1;
+			tmp.identifier = "Y"; tmp.name = "Y"; tmp.value = 1;
 			RNA_enum_item_add(&item, &totitem, &tmp);
-			tmp.identifier = "CB"; tmp.name= "Cr"; tmp.value= 2;
+			tmp.identifier = "CB"; tmp.name = "Cr"; tmp.value = 2;
 			RNA_enum_item_add(&item, &totitem, &tmp);
-			tmp.identifier = "CR"; tmp.name= "Cb"; tmp.value= 3;
+			tmp.identifier = "CR"; tmp.name = "Cb"; tmp.value = 3;
 			RNA_enum_item_add(&item, &totitem, &tmp);
 			break;
 		default:
@@ -6314,29 +6314,29 @@ static void rna_def_node_sockets_api(BlenderRNA *brna, PropertyRNA *cprop, int i
 	const char *clearfunc = (in_out == SOCK_IN ? "rna_Node_inputs_clear" : "rna_Node_outputs_clear");
 
 	RNA_def_property_srna(cprop, structtype);
-	srna= RNA_def_struct(brna, structtype, NULL);
+	srna = RNA_def_struct(brna, structtype, NULL);
 	RNA_def_struct_sdna(srna, "bNode");
 	RNA_def_struct_ui_text(srna, uiname, "Collection of Node Sockets");
 
-	func= RNA_def_function(srna, "new", newfunc);
+	func = RNA_def_function(srna, "new", newfunc);
 	RNA_def_function_ui_description(func, "Add a socket to this node");
 	RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_REPORTS);
-	parm= RNA_def_string(func, "type", "", MAX_NAME, "Type", "Data type");
+	parm = RNA_def_string(func, "type", "", MAX_NAME, "Type", "Data type");
 	RNA_def_property_flag(parm, PROP_REQUIRED);
-	parm= RNA_def_string(func, "name", "", MAX_NAME, "Name", "");
+	parm = RNA_def_string(func, "name", "", MAX_NAME, "Name", "");
 	RNA_def_property_flag(parm, PROP_REQUIRED);
 	RNA_def_string(func, "identifier", "", MAX_NAME, "Identifier", "Unique socket identifier");
 	/* return value */
-	parm= RNA_def_pointer(func, "socket", "NodeSocket", "", "New socket");
+	parm = RNA_def_pointer(func, "socket", "NodeSocket", "", "New socket");
 	RNA_def_function_return(func, parm);
 
-	func= RNA_def_function(srna, "remove", "rna_Node_socket_remove");
+	func = RNA_def_function(srna, "remove", "rna_Node_socket_remove");
 	RNA_def_function_ui_description(func, "Remove a socket from this node");
 	RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_REPORTS);
-	parm= RNA_def_pointer(func, "socket", "NodeSocket", "", "The socket to remove");
+	parm = RNA_def_pointer(func, "socket", "NodeSocket", "", "The socket to remove");
 	RNA_def_property_flag(parm, PROP_REQUIRED);
 
-	func= RNA_def_function(srna, "clear", clearfunc);
+	func = RNA_def_function(srna, "clear", clearfunc);
 	RNA_def_function_ui_description(func, "Remove all sockets from this node");
 	RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_REPORTS);
 }
@@ -6493,7 +6493,7 @@ static void rna_def_node(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "bl_idname", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "typeinfo->idname");
 	RNA_def_property_string_funcs(prop, "rna_Node_bl_idname_get", "rna_Node_bl_idname_length", NULL);
-	RNA_def_property_flag(prop, PROP_REGISTER|PROP_NEVER_CLAMP);
+	RNA_def_property_flag(prop, PROP_REGISTER | PROP_NEVER_CLAMP);
 	RNA_def_property_ui_text(prop, "ID Name", "");
 
 	prop = RNA_def_property(srna, "bl_label", PROP_STRING, PROP_NONE);
@@ -6568,22 +6568,22 @@ static void rna_def_node(BlenderRNA *brna)
 	RNA_def_function_ui_description(func, "Draw node buttons");
 	RNA_def_function_flag(func, FUNC_REGISTER_OPTIONAL);
 	parm = RNA_def_pointer(func, "context", "Context", "", "");
-	RNA_def_property_flag(parm, PROP_REQUIRED|PROP_NEVER_NULL);
+	RNA_def_property_flag(parm, PROP_REQUIRED | PROP_NEVER_NULL);
 	parm = RNA_def_property(func, "layout", PROP_POINTER, PROP_NONE);
 	RNA_def_property_struct_type(parm, "UILayout");
 	RNA_def_property_ui_text(parm, "Layout", "Layout in the UI");
-	RNA_def_property_flag(parm, PROP_REQUIRED|PROP_NEVER_NULL);
+	RNA_def_property_flag(parm, PROP_REQUIRED | PROP_NEVER_NULL);
 
 	/* draw buttons extended */
 	func = RNA_def_function(srna, "draw_buttons_ext", NULL);
 	RNA_def_function_ui_description(func, "Draw node buttons in the sidebar");
 	RNA_def_function_flag(func, FUNC_REGISTER_OPTIONAL);
 	parm = RNA_def_pointer(func, "context", "Context", "", "");
-	RNA_def_property_flag(parm, PROP_REQUIRED|PROP_NEVER_NULL);
+	RNA_def_property_flag(parm, PROP_REQUIRED | PROP_NEVER_NULL);
 	parm = RNA_def_property(func, "layout", PROP_POINTER, PROP_NONE);
 	RNA_def_property_struct_type(parm, "UILayout");
 	RNA_def_property_ui_text(parm, "Layout", "Layout in the UI");
-	RNA_def_property_flag(parm, PROP_REQUIRED|PROP_NEVER_NULL);
+	RNA_def_property_flag(parm, PROP_REQUIRED | PROP_NEVER_NULL);
 }
 
 static void rna_def_node_link(BlenderRNA *brna)
@@ -6638,27 +6638,27 @@ static void rna_def_nodetree_nodes_api(BlenderRNA *brna, PropertyRNA *cprop)
 	FunctionRNA *func;
 
 	RNA_def_property_srna(cprop, "Nodes");
-	srna= RNA_def_struct(brna, "Nodes", NULL);
+	srna = RNA_def_struct(brna, "Nodes", NULL);
 	RNA_def_struct_sdna(srna, "bNodeTree");
 	RNA_def_struct_ui_text(srna, "Nodes", "Collection of Nodes");
 
-	func= RNA_def_function(srna, "new", "rna_NodeTree_node_new");
+	func = RNA_def_function(srna, "new", "rna_NodeTree_node_new");
 	RNA_def_function_ui_description(func, "Add a node to this node tree");
 	RNA_def_function_flag(func, FUNC_USE_CONTEXT | FUNC_USE_REPORTS);
-	parm= RNA_def_string(func, "type", "", MAX_NAME, "Type", "Type of node to add");
+	parm = RNA_def_string(func, "type", "", MAX_NAME, "Type", "Type of node to add");
 	RNA_def_property_flag(parm, PROP_REQUIRED);
 	/* return value */
-	parm= RNA_def_pointer(func, "node", "Node", "", "New node");
+	parm = RNA_def_pointer(func, "node", "Node", "", "New node");
 	RNA_def_function_return(func, parm);
 
-	func= RNA_def_function(srna, "remove", "rna_NodeTree_node_remove");
+	func = RNA_def_function(srna, "remove", "rna_NodeTree_node_remove");
 	RNA_def_function_ui_description(func, "Remove a node from this node tree");
 	RNA_def_function_flag(func, FUNC_USE_REPORTS);
-	parm= RNA_def_pointer(func, "node", "Node", "", "The node to remove");
+	parm = RNA_def_pointer(func, "node", "Node", "", "The node to remove");
 	RNA_def_property_flag(parm, PROP_REQUIRED | PROP_NEVER_NULL | PROP_RNAPTR);
 	RNA_def_property_clear_flag(parm, PROP_THICK_WRAP);
 
-	func= RNA_def_function(srna, "clear", "rna_NodeTree_node_clear");
+	func = RNA_def_function(srna, "clear", "rna_NodeTree_node_clear");
 	RNA_def_function_ui_description(func, "Remove all nodes from this node tree");
 	RNA_def_function_flag(func, FUNC_USE_REPORTS);
 
@@ -6716,28 +6716,28 @@ static void rna_def_node_tree_sockets_api(BlenderRNA *brna, PropertyRNA *cprop,
 	const char *clearfunc = (in_out == SOCK_IN ? "rna_NodeTree_inputs_clear" : "rna_NodeTree_outputs_clear");
 
 	RNA_def_property_srna(cprop, structtype);
-	srna= RNA_def_struct(brna, structtype, NULL);
+	srna = RNA_def_struct(brna, structtype, NULL);
 	RNA_def_struct_sdna(srna, "bNodeTree");
 	RNA_def_struct_ui_text(srna, uiname, "Collection of Node Tree Sockets");
 
-	func= RNA_def_function(srna, "new", newfunc);
+	func = RNA_def_function(srna, "new", newfunc);
 	RNA_def_function_ui_description(func, "Add a socket to this node tree");
 	RNA_def_function_flag(func, FUNC_USE_REPORTS);
-	parm= RNA_def_string(func, "type", "", MAX_NAME, "Type", "Data type");
+	parm = RNA_def_string(func, "type", "", MAX_NAME, "Type", "Data type");
 	RNA_def_property_flag(parm, PROP_REQUIRED);
-	parm= RNA_def_string(func, "name", "", MAX_NAME, "Name", "");
+	parm = RNA_def_string(func, "name", "", MAX_NAME, "Name", "");
 	RNA_def_property_flag(parm, PROP_REQUIRED);
 	/* return value */
-	parm= RNA_def_pointer(func, "socket", "NodeSocketInterface", "", "New socket");
+	parm = RNA_def_pointer(func, "socket", "NodeSocketInterface", "", "New socket");
 	RNA_def_function_return(func, parm);
 
-	func= RNA_def_function(srna, "remove", "rna_NodeTree_socket_remove");
+	func = RNA_def_function(srna, "remove", "rna_NodeTree_socket_remove");
 	RNA_def_function_ui_description(func, "Remove a socket from this node tree");
 	RNA_def_function_flag(func, FUNC_USE_REPORTS);
-	parm= RNA_def_pointer(func, "socket", "NodeSocketInterface", "", "The socket to remove");
+	parm = RNA_def_pointer(func, "socket", "NodeSocketInterface", "", "The socket to remove");
 	RNA_def_property_flag(parm, PROP_REQUIRED);
 
-	func= RNA_def_function(srna, "clear", clearfunc);
+	func = RNA_def_function(srna, "clear", clearfunc);
 	RNA_def_function_ui_description(func, "Remove all sockets from this node tree");
 	RNA_def_function_flag(func, FUNC_USE_REPORTS);
 }
@@ -6832,7 +6832,7 @@ static void rna_def_nodetree(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "bl_idname", PROP_STRING, PROP_NONE);
 	RNA_def_property_string_sdna(prop, NULL, "typeinfo->idname");
 	RNA_def_property_string_funcs(prop, "rna_NodeTree_bl_idname_get", "rna_NodeTree_bl_idname_length", NULL);
-	RNA_def_property_flag(prop, PROP_REGISTER|PROP_NEVER_CLAMP);
+	RNA_def_property_flag(prop, PROP_REGISTER | PROP_NEVER_CLAMP);
 	RNA_def_property_ui_text(prop, "ID Name", "");
 
 	prop = RNA_def_property(srna, "bl_label", PROP_STRING, PROP_NONE);
@@ -6867,11 +6867,11 @@ static void rna_def_nodetree(BlenderRNA *brna)
 	RNA_def_function_ui_description(func, "Draw the menu for adding nodes");
 	RNA_def_function_flag(func, FUNC_REGISTER_OPTIONAL);
 	parm = RNA_def_pointer(func, "context", "Context", "", "");
-	RNA_def_property_flag(parm, PROP_REQUIRED|PROP_NEVER_NULL);
+	RNA_def_property_flag(parm, PROP_REQUIRED | PROP_NEVER_NULL);
 	parm = RNA_def_property(func, "layout", PROP_POINTER, PROP_NONE);
 	RNA_def_property_struct_type(parm, "UILayout");
 	RNA_def_property_ui_text(parm, "Layout", "Menu layout in the UI");
-	RNA_def_property_flag(parm, PROP_REQUIRED|PROP_NEVER_NULL);
+	RNA_def_property_flag(parm, PROP_REQUIRED | PROP_NEVER_NULL);
 
 	/* get a node tree from context */
 	func = RNA_def_function(srna, "get_from_context", NULL);
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index f365352ca30..a756fdab4f8 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -1038,12 +1038,12 @@ static void rna_SpaceNodeEditor_node_tree_update(const bContext *C, PointerRNA *
 
 static int rna_SpaceNodeEditor_tree_type_get(PointerRNA *ptr)
 {
-	SpaceNode *snode= (SpaceNode*)ptr->data;
+	SpaceNode *snode = (SpaceNode *)ptr->data;
 	return rna_node_tree_idname_to_enum(snode->tree_idname);
 }
 static void rna_SpaceNodeEditor_tree_type_set(PointerRNA *ptr, int value)
 {
-	SpaceNode *snode= (SpaceNode*)ptr->data;
+	SpaceNode *snode = (SpaceNode *)ptr->data;
 	ED_node_set_tree_type(snode, rna_node_tree_type_from_enum(value));
 }
 static int rna_SpaceNodeEditor_tree_type_poll(void *Cv, bNodeTreeType *type)
@@ -3266,7 +3266,7 @@ static void rna_def_space_node(BlenderRNA *brna)
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "ID From", "Datablock from which the edited datablock is linked");
 
-	prop= RNA_def_property(srna, "path", PROP_COLLECTION, PROP_NONE);
+	prop = RNA_def_property(srna, "path", PROP_COLLECTION, PROP_NONE);
 	RNA_def_property_collection_sdna(prop, NULL, "treepath", NULL);
 	RNA_def_property_struct_type(prop, "NodeTreePath");
 	RNA_def_property_ui_text(prop, "Node Tree Path", "Path from the data block to the currently edited node tree");
@@ -3279,16 +3279,16 @@ static void rna_def_space_node(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Node Tree", "Base node tree from context");
 	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_NODE, "rna_SpaceNodeEditor_node_tree_update");
 
-	prop= RNA_def_property(srna, "edit_tree", PROP_POINTER, PROP_NONE);
+	prop = RNA_def_property(srna, "edit_tree", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "edittree");
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Edit Tree", "Node tree being displayed and edited");
 
-	prop= RNA_def_property(srna, "pin", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "pin", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SNODE_PIN);
 	RNA_def_property_ui_text(prop, "Pinned", "Use the pinned node tree");
 	RNA_def_property_ui_icon(prop, ICON_UNPINNED, 1);
-	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_NODE, NULL);
+	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_NODE, NULL);
 
 	prop = RNA_def_property(srna, "show_backdrop", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", SNODE_BACKDRAW);
diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c
index 009823555f0..e8f812506e2 100644
--- a/source/blender/makesrna/intern/rna_texture.c
+++ b/source/blender/makesrna/intern/rna_texture.c
@@ -382,7 +382,7 @@ static void rna_Texture_use_color_ramp_set(PointerRNA *ptr, int value)
 	else tex->flag &= ~TEX_COLORBAND;
 
 	if ((tex->flag & TEX_COLORBAND) && tex->coba == NULL)
-		tex->coba = add_colorband(0);
+		tex->coba = add_colorband(false);
 }
 
 static void rna_Texture_use_nodes_update(bContext *C, PointerRNA *ptr)
diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c
index 41d1411d35c..b2f17bfed8b 100644
--- a/source/blender/makesrna/intern/rna_ui_api.c
+++ b/source/blender/makesrna/intern/rna_ui_api.c
@@ -834,7 +834,7 @@ void RNA_api_ui_layout(StructRNA *srna)
 	func = RNA_def_function(srna, "template_component_menu", "uiTemplateComponentMenu");
 	RNA_def_function_ui_description(func, "Item. Display expanded property in a popup menu");
 	parm = RNA_def_pointer(func, "data", "AnyType", "", "Data from which to take property");
-	RNA_def_property_flag(parm, PROP_REQUIRED|PROP_RNAPTR);
+	RNA_def_property_flag(parm, PROP_REQUIRED | PROP_RNAPTR);
 	parm = RNA_def_string(func, "property", "", 0, "", "Identifier of property in data");
 	RNA_def_property_flag(parm, PROP_REQUIRED);
 	RNA_def_string(func, "name", "", 0, "", "");
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 12fac82fb75..0023f164edc 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -1884,7 +1884,7 @@ static void rna_def_userdef_theme_space_node(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Group Node", "");
 	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
-	prop= RNA_def_property(srna, "group_socket_node", PROP_FLOAT, PROP_COLOR_GAMMA);
+	prop = RNA_def_property(srna, "group_socket_node", PROP_FLOAT, PROP_COLOR_GAMMA);
 	RNA_def_property_float_sdna(prop, NULL, "console_output");
 	RNA_def_property_array(prop, 3);
 	RNA_def_property_ui_text(prop, "Group Socket Node", "");
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;
 	
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 5b3471b571c..828c4a46a48 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -918,7 +918,7 @@ static void flag_render_node_material(Render *re, bNodeTree *ntree)
 {
 	bNode *node;
 
-	for (node=ntree->nodes.first; node; node= node->next) {
+	for (node = ntree->nodes.first; node; node = node->next) {
 		if (node->id) {
 			if (GS(node->id->name)==ID_MA) {
 				Material *ma= (Material *)node->id;
@@ -5660,7 +5660,7 @@ void RE_Database_FromScene_Vectors(Render *re, Main *bmain, Scene *sce, unsigned
 						ok= 1;
 				}
 				if (ok==0) {
-					printf("speed table: missing object %s\n", obi->ob->id.name+2);
+					printf("speed table: missing object %s\n", obi->ob->id.name + 2);
 					continue;
 				}
 
@@ -5676,7 +5676,7 @@ void RE_Database_FromScene_Vectors(Render *re, Main *bmain, Scene *sce, unsigned
 					if (obi->totvector==oldobi->totvector)
 						calculate_speedvectors(re, obi, oldobi->vectors, step);
 					else
-						printf("Warning: object %s has different amount of vertices or strands on other frame\n", obi->ob->id.name+2);
+						printf("Warning: object %s has different amount of vertices or strands on other frame\n", obi->ob->id.name + 2);
 				}  /* not fluidsim */
 
 				oldobi= oldobi->next;
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index e67c8520e75..9f44e42469b 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -1458,7 +1458,7 @@ static bool rlayer_node_uses_alpha(bNodeTree *ntree, bNode *node)
 
 	for (sock = node->outputs.first; sock; sock = sock->next) {
 		/* Weak! but how to make it better? */
-		if (!strcmp(sock->name, "Alpha") && nodeCountSocketLinks(ntree, sock) > 0)
+		if (STREQ(sock->name, "Alpha") && nodeCountSocketLinks(ntree, sock) > 0)
 			return true;
 	}
 
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index 6e557647d12..d908a33c706 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -198,7 +198,7 @@ void WM_init(bContext *C, int argc, const char **argv)
 	clear_matcopybuf();
 	ED_render_clear_mtex_copybuf();
 
-	//	glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
+	// glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 		
 	ED_preview_init_dbase();
 	
diff --git a/source/blender/windowmanager/intern/wm_playanim.c b/source/blender/windowmanager/intern/wm_playanim.c
index a289d182f1c..e4e529ace71 100644
--- a/source/blender/windowmanager/intern/wm_playanim.c
+++ b/source/blender/windowmanager/intern/wm_playanim.c
@@ -825,7 +825,7 @@ static void playanim_window_zoom(PlayState *ps, const float zoom_offset)
 	sizey = ps->zoom * ps->ibufy;
 	/* ofsx -= sizex / 2; */ /* UNUSED */
 	/* ofsy -= sizey / 2; */ /* UNUSED */
-	// window_set_position(g_WS.ghost_window,sizex,sizey);
+	// window_set_position(g_WS.ghost_window, sizex, sizey);
 	GHOST_SetClientSize(g_WS.ghost_window, sizex, sizey);
 }