ClangFormat: apply to source, most of intern

Apply clang format as proposed in T53211.

For details on usage and instructions for migrating branches
without conflicts, see:

https://wiki.blender.org/wiki/Tools/ClangFormat

83 files changed, 2412 insertions, 2382 deletions

diff --git a/source/blender/nodes/composite/node_composite_tree.c b/source/blender/nodes/composite/node_composite_tree.c
index 5ef698c553b..53fdde5baf2 100644
--- a/source/blender/nodes/composite/node_composite_tree.c
+++ b/source/blender/nodes/composite/node_composite_tree.c
@@ -21,7 +21,6 @@
  * \ingroup nodes
  */
 
-
 #include <stdio.h>
 
 #include "DNA_color_types.h"
@@ -48,187 +47,196 @@
 #  include "COM_compositor.h"
 #endif
 
-static void composite_get_from_context(const bContext *C, bNodeTreeType *UNUSED(treetype), bNodeTree **r_ntree, ID **r_id, ID **r_from)
+static void composite_get_from_context(const bContext *C,
+                                       bNodeTreeType *UNUSED(treetype),
+                                       bNodeTree **r_ntree,
+                                       ID **r_id,
+                                       ID **r_from)
 {
-	Scene *scene = CTX_data_scene(C);
+  Scene *scene = CTX_data_scene(C);
 
-	*r_from = NULL;
-	*r_id = &scene->id;
-	*r_ntree = scene->nodetree;
+  *r_from = NULL;
+  *r_id = &scene->id;
+  *r_ntree = scene->nodetree;
 }
 
 static void foreach_nodeclass(Scene *UNUSED(scene), void *calldata, bNodeClassCallback func)
 {
-	func(calldata, NODE_CLASS_INPUT, N_("Input"));
-	func(calldata, NODE_CLASS_OUTPUT, N_("Output"));
-	func(calldata, NODE_CLASS_OP_COLOR, N_("Color"));
-	func(calldata, NODE_CLASS_OP_VECTOR, N_("Vector"));
-	func(calldata, NODE_CLASS_OP_FILTER, N_("Filter"));
-	func(calldata, NODE_CLASS_CONVERTOR, N_("Convertor"));
-	func(calldata, NODE_CLASS_MATTE, N_("Matte"));
-	func(calldata, NODE_CLASS_DISTORT, N_("Distort"));
-	func(calldata, NODE_CLASS_GROUP, N_("Group"));
-	func(calldata, NODE_CLASS_INTERFACE, N_("Interface"));
-	func(calldata, NODE_CLASS_LAYOUT, N_("Layout"));
+  func(calldata, NODE_CLASS_INPUT, N_("Input"));
+  func(calldata, NODE_CLASS_OUTPUT, N_("Output"));
+  func(calldata, NODE_CLASS_OP_COLOR, N_("Color"));
+  func(calldata, NODE_CLASS_OP_VECTOR, N_("Vector"));
+  func(calldata, NODE_CLASS_OP_FILTER, N_("Filter"));
+  func(calldata, NODE_CLASS_CONVERTOR, N_("Convertor"));
+  func(calldata, NODE_CLASS_MATTE, N_("Matte"));
+  func(calldata, NODE_CLASS_DISTORT, N_("Distort"));
+  func(calldata, NODE_CLASS_GROUP, N_("Group"));
+  func(calldata, NODE_CLASS_INTERFACE, N_("Interface"));
+  func(calldata, NODE_CLASS_LAYOUT, N_("Layout"));
 }
 
 static void free_node_cache(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	bNodeSocket *sock;
+  bNodeSocket *sock;
 
-	for (sock = node->outputs.first; sock; sock = sock->next) {
-		if (sock->cache) {
-			sock->cache = NULL;
-		}
-	}
+  for (sock = node->outputs.first; sock; sock = sock->next) {
+    if (sock->cache) {
+      sock->cache = NULL;
+    }
+  }
 }
 
 static void free_cache(bNodeTree *ntree)
 {
-	bNode *node;
-	for (node = ntree->nodes.first; node; node = node->next)
-		free_node_cache(ntree, node);
+  bNode *node;
+  for (node = ntree->nodes.first; node; node = node->next)
+    free_node_cache(ntree, node);
 }
 
 /* local tree then owns all compbufs */
 static void localize(bNodeTree *UNUSED(localtree), bNodeTree *ntree)
 {
-	bNode *node;
-	bNodeSocket *sock;
-
-	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;
-
-		/* move over the compbufs */
-		/* right after ntreeCopyTree() oldsock pointers are valid */
-
-		if (ELEM(node->type, CMP_NODE_VIEWER, CMP_NODE_SPLITVIEWER)) {
-			if (node->id) {
-				if (node->flag & NODE_DO_OUTPUT)
-					node->new_node->id = (ID *)node->id;
-				else
-					node->new_node->id = NULL;
-			}
-		}
-
-		for (sock = node->outputs.first; sock; sock = sock->next) {
-			sock->new_sock->cache = sock->cache;
-			sock->cache = NULL;
-			sock->new_sock->new_sock = sock;
-		}
-	}
+  bNode *node;
+  bNodeSocket *sock;
+
+  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;
+
+    /* move over the compbufs */
+    /* right after ntreeCopyTree() oldsock pointers are valid */
+
+    if (ELEM(node->type, CMP_NODE_VIEWER, CMP_NODE_SPLITVIEWER)) {
+      if (node->id) {
+        if (node->flag & NODE_DO_OUTPUT)
+          node->new_node->id = (ID *)node->id;
+        else
+          node->new_node->id = NULL;
+      }
+    }
+
+    for (sock = node->outputs.first; sock; sock = sock->next) {
+      sock->new_sock->cache = sock->cache;
+      sock->cache = NULL;
+      sock->new_sock->new_sock = sock;
+    }
+  }
 }
 
 static void local_sync(bNodeTree *localtree, bNodeTree *ntree)
 {
-	BKE_node_preview_sync_tree(ntree, localtree);
+  BKE_node_preview_sync_tree(ntree, localtree);
 }
 
 static void local_merge(Main *bmain, bNodeTree *localtree, bNodeTree *ntree)
 {
-	bNode *lnode;
-	bNodeSocket *lsock;
-
-	/* move over the compbufs and previews */
-	BKE_node_preview_merge_tree(ntree, localtree, true);
-
-	for (lnode = localtree->nodes.first; lnode; lnode = lnode->next) {
-		if (ntreeNodeExists(ntree, lnode->new_node)) {
-			if (ELEM(lnode->type, CMP_NODE_VIEWER, CMP_NODE_SPLITVIEWER)) {
-				if (lnode->id && (lnode->flag & NODE_DO_OUTPUT)) {
-					/* image_merge does sanity check for pointers */
-					BKE_image_merge(bmain, (Image *)lnode->new_node->id, (Image *)lnode->id);
-				}
-			}
-			else if (lnode->type == CMP_NODE_MOVIEDISTORTION) {
-				/* special case for distortion node: distortion context is allocating in exec function
-				 * and to achieve much better performance on further calls this context should be
-				 * copied back to original node */
-				if (lnode->storage) {
-					if (lnode->new_node->storage)
-						BKE_tracking_distortion_free(lnode->new_node->storage);
-
-					lnode->new_node->storage = BKE_tracking_distortion_copy(lnode->storage);
-				}
-			}
-
-			for (lsock = lnode->outputs.first; lsock; lsock = lsock->next) {
-				if (ntreeOutputExists(lnode->new_node, lsock->new_sock)) {
-					lsock->new_sock->cache = lsock->cache;
-					lsock->cache = NULL;
-					lsock->new_sock = NULL;
-				}
-			}
-		}
-	}
+  bNode *lnode;
+  bNodeSocket *lsock;
+
+  /* move over the compbufs and previews */
+  BKE_node_preview_merge_tree(ntree, localtree, true);
+
+  for (lnode = localtree->nodes.first; lnode; lnode = lnode->next) {
+    if (ntreeNodeExists(ntree, lnode->new_node)) {
+      if (ELEM(lnode->type, CMP_NODE_VIEWER, CMP_NODE_SPLITVIEWER)) {
+        if (lnode->id && (lnode->flag & NODE_DO_OUTPUT)) {
+          /* image_merge does sanity check for pointers */
+          BKE_image_merge(bmain, (Image *)lnode->new_node->id, (Image *)lnode->id);
+        }
+      }
+      else if (lnode->type == CMP_NODE_MOVIEDISTORTION) {
+        /* special case for distortion node: distortion context is allocating in exec function
+         * and to achieve much better performance on further calls this context should be
+         * copied back to original node */
+        if (lnode->storage) {
+          if (lnode->new_node->storage)
+            BKE_tracking_distortion_free(lnode->new_node->storage);
+
+          lnode->new_node->storage = BKE_tracking_distortion_copy(lnode->storage);
+        }
+      }
+
+      for (lsock = lnode->outputs.first; lsock; lsock = lsock->next) {
+        if (ntreeOutputExists(lnode->new_node, lsock->new_sock)) {
+          lsock->new_sock->cache = lsock->cache;
+          lsock->cache = NULL;
+          lsock->new_sock = NULL;
+        }
+      }
+    }
+  }
 }
 
 static void update(bNodeTree *ntree)
 {
-	ntreeSetOutput(ntree);
+  ntreeSetOutput(ntree);
 
-	ntree_update_reroute_nodes(ntree);
+  ntree_update_reroute_nodes(ntree);
 
-	if (ntree->update & NTREE_UPDATE_NODES) {
-		/* clean up preview cache, in case nodes have been removed */
-		BKE_node_preview_remove_unused(ntree);
-	}
+  if (ntree->update & NTREE_UPDATE_NODES) {
+    /* clean up preview cache, in case nodes have been removed */
+    BKE_node_preview_remove_unused(ntree);
+  }
 }
 
 static void composite_node_add_init(bNodeTree *UNUSED(bnodetree), bNode *bnode)
 {
-	/* Composite node will only show previews for input classes
-	 * by default, other will be hidden
-	 * but can be made visible with the show_preview option */
-	if (bnode->typeinfo->nclass != NODE_CLASS_INPUT) {
-		bnode->flag &= ~NODE_PREVIEW;
-	}
+  /* Composite node will only show previews for input classes
+   * by default, other will be hidden
+   * but can be made visible with the show_preview option */
+  if (bnode->typeinfo->nclass != NODE_CLASS_INPUT) {
+    bnode->flag &= ~NODE_PREVIEW;
+  }
 }
 
 bNodeTreeType *ntreeType_Composite;
 
 void register_node_tree_type_cmp(void)
 {
-	bNodeTreeType *tt = ntreeType_Composite = MEM_callocN(sizeof(bNodeTreeType), "compositor node tree type");
-
-	tt->type = NTREE_COMPOSIT;
-	strcpy(tt->idname, "CompositorNodeTree");
-	strcpy(tt->ui_name, N_("Compositor"));
-	tt->ui_icon = 0;    /* defined in drawnode.c */
-	strcpy(tt->ui_description, N_("Compositing nodes"));
-
-	tt->free_cache = free_cache;
-	tt->free_node_cache = free_node_cache;
-	tt->foreach_nodeclass = foreach_nodeclass;
-	tt->localize = localize;
-	tt->local_sync = local_sync;
-	tt->local_merge = local_merge;
-	tt->update = update;
-	tt->get_from_context = composite_get_from_context;
-	tt->node_add_init = composite_node_add_init;
-
-	tt->ext.srna = &RNA_CompositorNodeTree;
-
-	ntreeTypeAdd(tt);
+  bNodeTreeType *tt = ntreeType_Composite = MEM_callocN(sizeof(bNodeTreeType),
+                                                        "compositor node tree type");
+
+  tt->type = NTREE_COMPOSIT;
+  strcpy(tt->idname, "CompositorNodeTree");
+  strcpy(tt->ui_name, N_("Compositor"));
+  tt->ui_icon = 0; /* defined in drawnode.c */
+  strcpy(tt->ui_description, N_("Compositing nodes"));
+
+  tt->free_cache = free_cache;
+  tt->free_node_cache = free_node_cache;
+  tt->foreach_nodeclass = foreach_nodeclass;
+  tt->localize = localize;
+  tt->local_sync = local_sync;
+  tt->local_merge = local_merge;
+  tt->update = update;
+  tt->get_from_context = composite_get_from_context;
+  tt->node_add_init = composite_node_add_init;
+
+  tt->ext.srna = &RNA_CompositorNodeTree;
+
+  ntreeTypeAdd(tt);
 }
 
-extern void *COM_linker_hack;  /* Quiet warning. */
+extern void *COM_linker_hack; /* Quiet warning. */
 void *COM_linker_hack = NULL;
 
-void ntreeCompositExecTree(Scene *scene, bNodeTree *ntree, RenderData *rd, int rendering, int do_preview,
+void ntreeCompositExecTree(Scene *scene,
+                           bNodeTree *ntree,
+                           RenderData *rd,
+                           int rendering,
+                           int do_preview,
                            const ColorManagedViewSettings *view_settings,
                            const ColorManagedDisplaySettings *display_settings,
                            const char *view_name)
 {
 #ifdef WITH_COMPOSITOR
-	COM_execute(rd, scene, ntree, rendering, view_settings, display_settings, view_name);
+  COM_execute(rd, scene, ntree, rendering, view_settings, display_settings, view_name);
 #else
-	UNUSED_VARS(scene, ntree, rd, rendering, view_settings, display_settings, view_name);
+  UNUSED_VARS(scene, ntree, rd, rendering, view_settings, display_settings, view_name);
 #endif
 
-	UNUSED_VARS(do_preview);
+  UNUSED_VARS(do_preview);
 }
 
 /* *********************************************** */
@@ -243,155 +251,158 @@ void ntreeCompositExecTree(Scene *scene, bNodeTree *ntree, RenderData *rd, int r
  */
 void ntreeCompositUpdateRLayers(bNodeTree *ntree)
 {
-	bNode *node;
-
-	if (ntree == NULL) return;
+  bNode *node;
 
-	for (node = ntree->nodes.first; node; node = node->next) {
-		if (node->type == CMP_NODE_R_LAYERS)
-			node_cmp_rlayers_outputs(ntree, node);
-	}
+  if (ntree == NULL)
+    return;
 
+  for (node = ntree->nodes.first; node; node = node->next) {
+    if (node->type == CMP_NODE_R_LAYERS)
+      node_cmp_rlayers_outputs(ntree, node);
+  }
 }
 
-void ntreeCompositRegisterPass(bNodeTree *ntree, Scene *scene, ViewLayer *view_layer, const char *name, int type)
+void ntreeCompositRegisterPass(
+    bNodeTree *ntree, Scene *scene, ViewLayer *view_layer, const char *name, int type)
 {
-	bNode *node;
+  bNode *node;
 
-	if (ntree == NULL) return;
-
-	for (node = ntree->nodes.first; node; node = node->next) {
-		if (node->type == CMP_NODE_R_LAYERS)
-			node_cmp_rlayers_register_pass(ntree, node, scene, view_layer, name, type);
-	}
+  if (ntree == NULL)
+    return;
 
+  for (node = ntree->nodes.first; node; node = node->next) {
+    if (node->type == CMP_NODE_R_LAYERS)
+      node_cmp_rlayers_register_pass(ntree, node, scene, view_layer, name, type);
+  }
 }
 
 /* called from render pipeline, to tag render input and output */
 /* need to do all scenes, to prevent errors when you re-render 1 scene */
 void ntreeCompositTagRender(Scene *curscene)
 {
-	Scene *sce;
-
-	/* XXX Think using G_MAIN here is valid, since you want to update current file's scene nodes,
-	 * not the ones in temp main generated for rendering?
-	 * This is still rather weak though, ideally render struct would store own main AND original G_MAIN... */
-	for (sce = G_MAIN->scenes.first; sce; sce = sce->id.next) {
-		if (sce->nodetree) {
-			bNode *node;
-
-			for (node = sce->nodetree->nodes.first; node; node = node->next) {
-				if (node->id == (ID *)curscene || node->type == CMP_NODE_COMPOSITE)
-					nodeUpdate(sce->nodetree, node);
-				else if (node->type == CMP_NODE_TEXTURE) /* uses scene sizex/sizey */
-					nodeUpdate(sce->nodetree, node);
-			}
-		}
-	}
+  Scene *sce;
+
+  /* XXX Think using G_MAIN here is valid, since you want to update current file's scene nodes,
+   * not the ones in temp main generated for rendering?
+   * This is still rather weak though, ideally render struct would store own main AND original G_MAIN... */
+  for (sce = G_MAIN->scenes.first; sce; sce = sce->id.next) {
+    if (sce->nodetree) {
+      bNode *node;
+
+      for (node = sce->nodetree->nodes.first; node; node = node->next) {
+        if (node->id == (ID *)curscene || node->type == CMP_NODE_COMPOSITE)
+          nodeUpdate(sce->nodetree, node);
+        else if (node->type == CMP_NODE_TEXTURE) /* uses scene sizex/sizey */
+          nodeUpdate(sce->nodetree, node);
+      }
+    }
+  }
 }
 
 static int node_animation_properties(bNodeTree *ntree, bNode *node)
 {
-	bNodeSocket *sock;
-	const ListBase *lb;
-	Link *link;
-	PointerRNA ptr;
-	PropertyRNA *prop;
-
-	/* check to see if any of the node's properties have fcurves */
-	RNA_pointer_create((ID *)ntree, &RNA_Node, node, &ptr);
-	lb = RNA_struct_type_properties(ptr.type);
-
-	for (link = lb->first; link; link = link->next) {
-		prop = (PropertyRNA *)link;
-
-		if (RNA_property_animated(&ptr, prop)) {
-			nodeUpdate(ntree, node);
-			return 1;
-		}
-	}
-
-	/* now check node sockets */
-	for (sock = node->inputs.first; sock; sock = sock->next) {
-		RNA_pointer_create((ID *)ntree, &RNA_NodeSocket, sock, &ptr);
-		prop = RNA_struct_find_property(&ptr, "default_value");
-
-		if (RNA_property_animated(&ptr, prop)) {
-			nodeUpdate(ntree, node);
-			return 1;
-		}
-	}
-
-	return 0;
+  bNodeSocket *sock;
+  const ListBase *lb;
+  Link *link;
+  PointerRNA ptr;
+  PropertyRNA *prop;
+
+  /* check to see if any of the node's properties have fcurves */
+  RNA_pointer_create((ID *)ntree, &RNA_Node, node, &ptr);
+  lb = RNA_struct_type_properties(ptr.type);
+
+  for (link = lb->first; link; link = link->next) {
+    prop = (PropertyRNA *)link;
+
+    if (RNA_property_animated(&ptr, prop)) {
+      nodeUpdate(ntree, node);
+      return 1;
+    }
+  }
+
+  /* now check node sockets */
+  for (sock = node->inputs.first; sock; sock = sock->next) {
+    RNA_pointer_create((ID *)ntree, &RNA_NodeSocket, sock, &ptr);
+    prop = RNA_struct_find_property(&ptr, "default_value");
+
+    if (RNA_property_animated(&ptr, prop)) {
+      nodeUpdate(ntree, node);
+      return 1;
+    }
+  }
+
+  return 0;
 }
 
 /* tags nodes that have animation capabilities */
 int ntreeCompositTagAnimated(bNodeTree *ntree)
 {
-	bNode *node;
-	int tagged = 0;
-
-	if (ntree == NULL) return 0;
-
-	for (node = ntree->nodes.first; node; node = node->next) {
-
-		tagged = node_animation_properties(ntree, node);
-
-		/* otherwise always tag these node types */
-		if (node->type == CMP_NODE_IMAGE) {
-			Image *ima = (Image *)node->id;
-			if (ima && BKE_image_is_animated(ima)) {
-				nodeUpdate(ntree, node);
-				tagged = 1;
-			}
-		}
-		else if (node->type == CMP_NODE_TIME) {
-			nodeUpdate(ntree, node);
-			tagged = 1;
-		}
-		/* here was tag render layer, but this is called after a render, so re-composites fail */
-		else if (node->type == NODE_GROUP) {
-			if (ntreeCompositTagAnimated((bNodeTree *)node->id)) {
-				nodeUpdate(ntree, node);
-			}
-		}
-		else if (ELEM(node->type, CMP_NODE_MOVIECLIP, CMP_NODE_TRANSFORM)) {
-			nodeUpdate(ntree, node);
-			tagged = 1;
-		}
-		else if (node->type == CMP_NODE_MASK) {
-			nodeUpdate(ntree, node);
-			tagged = 1;
-		}
-	}
-
-	return tagged;
+  bNode *node;
+  int tagged = 0;
+
+  if (ntree == NULL)
+    return 0;
+
+  for (node = ntree->nodes.first; node; node = node->next) {
+
+    tagged = node_animation_properties(ntree, node);
+
+    /* otherwise always tag these node types */
+    if (node->type == CMP_NODE_IMAGE) {
+      Image *ima = (Image *)node->id;
+      if (ima && BKE_image_is_animated(ima)) {
+        nodeUpdate(ntree, node);
+        tagged = 1;
+      }
+    }
+    else if (node->type == CMP_NODE_TIME) {
+      nodeUpdate(ntree, node);
+      tagged = 1;
+    }
+    /* here was tag render layer, but this is called after a render, so re-composites fail */
+    else if (node->type == NODE_GROUP) {
+      if (ntreeCompositTagAnimated((bNodeTree *)node->id)) {
+        nodeUpdate(ntree, node);
+      }
+    }
+    else if (ELEM(node->type, CMP_NODE_MOVIECLIP, CMP_NODE_TRANSFORM)) {
+      nodeUpdate(ntree, node);
+      tagged = 1;
+    }
+    else if (node->type == CMP_NODE_MASK) {
+      nodeUpdate(ntree, node);
+      tagged = 1;
+    }
+  }
+
+  return tagged;
 }
 
-
 /* called from image window preview */
 void ntreeCompositTagGenerators(bNodeTree *ntree)
 {
-	bNode *node;
+  bNode *node;
 
-	if (ntree == NULL) return;
+  if (ntree == NULL)
+    return;
 
-	for (node = ntree->nodes.first; node; node = node->next) {
-		if (ELEM(node->type, CMP_NODE_R_LAYERS, CMP_NODE_IMAGE))
-			nodeUpdate(ntree, node);
-	}
+  for (node = ntree->nodes.first; node; node = node->next) {
+    if (ELEM(node->type, CMP_NODE_R_LAYERS, CMP_NODE_IMAGE))
+      nodeUpdate(ntree, node);
+  }
 }
 
 /* XXX after render animation system gets a refresh, this call allows composite to end clean */
 void ntreeCompositClearTags(bNodeTree *ntree)
 {
-	bNode *node;
+  bNode *node;
 
-	if (ntree == NULL) return;
+  if (ntree == NULL)
+    return;
 
-	for (node = ntree->nodes.first; node; node = node->next) {
-		node->need_exec = 0;
-		if (node->type == NODE_GROUP)
-			ntreeCompositClearTags((bNodeTree *)node->id);
-	}
+  for (node = ntree->nodes.first; node; node = node->next) {
+    node->need_exec = 0;
+    if (node->type == NODE_GROUP)
+      ntreeCompositClearTags((bNodeTree *)node->id);
+  }
 }
diff --git a/source/blender/nodes/composite/node_composite_util.c b/source/blender/nodes/composite/node_composite_util.c
index 323cca70083..1ba81330d72 100644
--- a/source/blender/nodes/composite/node_composite_util.c
+++ b/source/blender/nodes/composite/node_composite_util.c
@@ -23,30 +23,29 @@
 
 #include "node_composite_util.h"
 
-
 bool cmp_node_poll_default(bNodeType *UNUSED(ntype), bNodeTree *ntree)
 {
-	return STREQ(ntree->idname, "CompositorNodeTree");
+  return STREQ(ntree->idname, "CompositorNodeTree");
 }
 
 void cmp_node_update_default(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	bNodeSocket *sock;
-	for (sock = node->outputs.first; sock; sock = sock->next) {
-		if (sock->cache) {
-			//free_compbuf(sock->cache);
-			//sock->cache = NULL;
-		}
-	}
-	node->need_exec = 1;
+  bNodeSocket *sock;
+  for (sock = node->outputs.first; sock; sock = sock->next) {
+    if (sock->cache) {
+      //free_compbuf(sock->cache);
+      //sock->cache = NULL;
+    }
+  }
+  node->need_exec = 1;
 }
 
 void cmp_node_type_base(bNodeType *ntype, int type, const char *name, short nclass, short flag)
 {
-	node_type_base(ntype, type, name, nclass, flag);
+  node_type_base(ntype, type, name, nclass, flag);
 
-	ntype->poll = cmp_node_poll_default;
-	ntype->updatefunc = cmp_node_update_default;
-	ntype->insert_link = node_insert_link_default;
-	ntype->update_internal_links = node_update_internal_links_default;
+  ntype->poll = cmp_node_poll_default;
+  ntype->updatefunc = cmp_node_update_default;
+  ntype->insert_link = node_insert_link_default;
+  ntype->update_internal_links = node_update_internal_links_default;
 }
diff --git a/source/blender/nodes/composite/node_composite_util.h b/source/blender/nodes/composite/node_composite_util.h
index d1f6e46b6f3..c7785682865 100644
--- a/source/blender/nodes/composite/node_composite_util.h
+++ b/source/blender/nodes/composite/node_composite_util.h
@@ -21,7 +21,6 @@
  * \ingroup nodes
  */
 
-
 #ifndef __NODE_COMPOSITE_UTIL_H__
 #define __NODE_COMPOSITE_UTIL_H__
 
@@ -50,10 +49,11 @@
 /* only for forward declarations */
 #include "NOD_composite.h"
 
-#define CMP_SCALE_MAX	12000
+#define CMP_SCALE_MAX 12000
 
 bool cmp_node_poll_default(struct bNodeType *ntype, struct bNodeTree *ntree);
 void cmp_node_update_default(struct bNodeTree *UNUSED(ntree), struct bNode *node);
-void cmp_node_type_base(struct bNodeType *ntype, int type, const char *name, short nclass, short flag);
+void cmp_node_type_base(
+    struct bNodeType *ntype, int type, const char *name, short nclass, short flag);
 
-#endif  /* __NODE_COMPOSITE_UTIL_H__ */
+#endif /* __NODE_COMPOSITE_UTIL_H__ */
diff --git a/source/blender/nodes/composite/nodes/node_composite_alphaOver.c b/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
index 0ad273ac6b8..e0e842a7df3 100644
--- a/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
+++ b/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
@@ -25,29 +25,30 @@
 
 /* **************** ALPHAOVER ******************** */
 static bNodeSocketTemplate cmp_node_alphaover_in[] = {
-	{	SOCK_FLOAT, 1, N_("Fac"),			1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
-	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
-	{	-1, 0, ""	},
+    {SOCK_FLOAT, 1, N_("Fac"), 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate cmp_node_alphaover_out[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 static void node_alphaover_init(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	node->storage = MEM_callocN(sizeof(NodeTwoFloats), "NodeTwoFloats");
+  node->storage = MEM_callocN(sizeof(NodeTwoFloats), "NodeTwoFloats");
 }
 
 void register_node_type_cmp_alphaover(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_ALPHAOVER, "Alpha Over", NODE_CLASS_OP_COLOR, 0);
-	node_type_socket_templates(&ntype, cmp_node_alphaover_in, cmp_node_alphaover_out);
-	node_type_init(&ntype, node_alphaover_init);
-	node_type_storage(&ntype, "NodeTwoFloats", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(&ntype, CMP_NODE_ALPHAOVER, "Alpha Over", NODE_CLASS_OP_COLOR, 0);
+  node_type_socket_templates(&ntype, cmp_node_alphaover_in, cmp_node_alphaover_out);
+  node_type_init(&ntype, node_alphaover_init);
+  node_type_storage(
+      &ntype, "NodeTwoFloats", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
index b009e1d8128..8c46349e091 100644
--- a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
+++ b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
@@ -25,33 +25,32 @@
 
 /* **************** BILATERALBLUR ******************** */
 static bNodeSocketTemplate cmp_node_bilateralblur_in[] = {
-	{ SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
-	{ SOCK_RGBA, 1, N_("Determinator"), 1.0f, 1.0f, 1.0f, 1.0f},
-	{ -1, 0, "" }
-};
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {SOCK_RGBA, 1, N_("Determinator"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {-1, 0, ""}};
 
-static bNodeSocketTemplate cmp_node_bilateralblur_out[] = {
-	{ SOCK_RGBA, 0, N_("Image")},
-	{ -1, 0, "" }
-};
+static bNodeSocketTemplate cmp_node_bilateralblur_out[] = {{SOCK_RGBA, 0, N_("Image")},
+                                                           {-1, 0, ""}};
 
 static void node_composit_init_bilateralblur(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeBilateralBlurData *nbbd = MEM_callocN(sizeof(NodeBilateralBlurData), "node bilateral blur data");
-	node->storage = nbbd;
-	nbbd->iter = 1;
-	nbbd->sigma_color = 0.3;
-	nbbd->sigma_space = 5.0;
+  NodeBilateralBlurData *nbbd = MEM_callocN(sizeof(NodeBilateralBlurData),
+                                            "node bilateral blur data");
+  node->storage = nbbd;
+  nbbd->iter = 1;
+  nbbd->sigma_color = 0.3;
+  nbbd->sigma_space = 5.0;
 }
 
 void register_node_type_cmp_bilateralblur(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_BILATERALBLUR, "Bilateral Blur", NODE_CLASS_OP_FILTER, 0);
-	node_type_socket_templates(&ntype, cmp_node_bilateralblur_in, cmp_node_bilateralblur_out);
-	node_type_init(&ntype, node_composit_init_bilateralblur);
-	node_type_storage(&ntype, "NodeBilateralBlurData", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(&ntype, CMP_NODE_BILATERALBLUR, "Bilateral Blur", NODE_CLASS_OP_FILTER, 0);
+  node_type_socket_templates(&ntype, cmp_node_bilateralblur_in, cmp_node_bilateralblur_out);
+  node_type_init(&ntype, node_composit_init_bilateralblur);
+  node_type_storage(
+      &ntype, "NodeBilateralBlurData", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_blur.c b/source/blender/nodes/composite/nodes/node_composite_blur.c
index fa455fcd412..535b5db9a46 100644
--- a/source/blender/nodes/composite/nodes/node_composite_blur.c
+++ b/source/blender/nodes/composite/nodes/node_composite_blur.c
@@ -22,35 +22,31 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 /* **************** BLUR ******************** */
 static bNodeSocketTemplate cmp_node_blur_in[] = {
-	{   SOCK_RGBA, 1, N_("Image"),          1.0f, 1.0f, 1.0f, 1.0f},
-	{   SOCK_FLOAT, 1, N_("Size"),          1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
-	{   -1, 0, ""   }
-};
-static bNodeSocketTemplate cmp_node_blur_out[] = {
-	{   SOCK_RGBA, 0, N_("Image")},
-	{   -1, 0, ""   }
-};
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {SOCK_FLOAT, 1, N_("Size"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
+    {-1, 0, ""}};
+static bNodeSocketTemplate cmp_node_blur_out[] = {{SOCK_RGBA, 0, N_("Image")}, {-1, 0, ""}};
 
 static void node_composit_init_blur(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeBlurData *data = MEM_callocN(sizeof(NodeBlurData), "node blur data");
-	data->filtertype = R_FILTER_GAUSS;
-	node->storage = data;
+  NodeBlurData *data = MEM_callocN(sizeof(NodeBlurData), "node blur data");
+  data->filtertype = R_FILTER_GAUSS;
+  node->storage = data;
 }
 
 void register_node_type_cmp_blur(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_BLUR, "Blur", NODE_CLASS_OP_FILTER, NODE_PREVIEW);
-	node_type_socket_templates(&ntype, cmp_node_blur_in, cmp_node_blur_out);
-	node_type_init(&ntype, node_composit_init_blur);
-	node_type_storage(&ntype, "NodeBlurData", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(&ntype, CMP_NODE_BLUR, "Blur", NODE_CLASS_OP_FILTER, NODE_PREVIEW);
+  node_type_socket_templates(&ntype, cmp_node_blur_in, cmp_node_blur_out);
+  node_type_init(&ntype, node_composit_init_blur);
+  node_type_storage(
+      &ntype, "NodeBlurData", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_bokehblur.c b/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
index 08cd1f2de28..c2fc1b74699 100644
--- a/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
+++ b/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
@@ -22,36 +22,32 @@
  * \ingroup cmpnodes
  */
 
-
 #include "../node_composite_util.h"
 
 /* **************** BLUR ******************** */
 static bNodeSocketTemplate cmp_node_bokehblur_in[] = {
-	{   SOCK_RGBA, 1, N_("Image"),          0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
-	{   SOCK_RGBA, 1, N_("Bokeh"),          1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f},
-	{   SOCK_FLOAT, 1, N_("Size"),          1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 10.0f},
-	{   SOCK_FLOAT, 1, N_("Bounding box"),  1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f},
-	{   -1, 0, ""   }
-};
+    {SOCK_RGBA, 1, N_("Image"), 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+    {SOCK_RGBA, 1, N_("Bokeh"), 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f},
+    {SOCK_FLOAT, 1, N_("Size"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 10.0f},
+    {SOCK_FLOAT, 1, N_("Bounding box"), 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f},
+    {-1, 0, ""}};
 
 static bNodeSocketTemplate cmp_node_bokehblur_out[] = {
-	{   SOCK_RGBA, 0, N_("Image"),          0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
-	{   -1, 0, ""   }
-};
+    {SOCK_RGBA, 0, N_("Image"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f}, {-1, 0, ""}};
 
 static void node_composit_init_bokehblur(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	node->custom3 = 4.0f;
-	node->custom4 = 16.0f;
+  node->custom3 = 4.0f;
+  node->custom4 = 16.0f;
 }
 
 void register_node_type_cmp_bokehblur(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_BOKEHBLUR, "Bokeh Blur", NODE_CLASS_OP_FILTER, 0);
-	node_type_socket_templates(&ntype, cmp_node_bokehblur_in, cmp_node_bokehblur_out);
-	node_type_init(&ntype, node_composit_init_bokehblur);
+  cmp_node_type_base(&ntype, CMP_NODE_BOKEHBLUR, "Bokeh Blur", NODE_CLASS_OP_FILTER, 0);
+  node_type_socket_templates(&ntype, cmp_node_bokehblur_in, cmp_node_bokehblur_out);
+  node_type_init(&ntype, node_composit_init_bokehblur);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_bokehimage.c b/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
index 31237584c46..b35d3d73faa 100644
--- a/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
+++ b/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
@@ -22,35 +22,35 @@
  * \ingroup cmpnodes
  */
 
-
 #include "../node_composite_util.h"
 
 /* **************** Bokeh image Tools  ******************** */
 
 static bNodeSocketTemplate cmp_node_bokehimage_out[] = {
-	{	SOCK_RGBA, 0, N_("Image"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
+    {-1, 0, ""},
 };
 
 static void node_composit_init_bokehimage(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeBokehImage *data = MEM_callocN(sizeof(NodeBokehImage), "NodeBokehImage");
-	data->angle = 0.0f;
-	data->flaps = 5;
-	data->rounding = 0.0f;
-	data->catadioptric = 0.0f;
-	data->lensshift = 0.0f;
-	node->storage = data;
+  NodeBokehImage *data = MEM_callocN(sizeof(NodeBokehImage), "NodeBokehImage");
+  data->angle = 0.0f;
+  data->flaps = 5;
+  data->rounding = 0.0f;
+  data->catadioptric = 0.0f;
+  data->lensshift = 0.0f;
+  node->storage = data;
 }
 
 void register_node_type_cmp_bokehimage(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_BOKEHIMAGE, "Bokeh Image", NODE_CLASS_INPUT, NODE_PREVIEW);
-	node_type_socket_templates(&ntype, NULL, cmp_node_bokehimage_out);
-	node_type_init(&ntype, node_composit_init_bokehimage);
-	node_type_storage(&ntype, "NodeBokehImage", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(&ntype, CMP_NODE_BOKEHIMAGE, "Bokeh Image", NODE_CLASS_INPUT, NODE_PREVIEW);
+  node_type_socket_templates(&ntype, NULL, cmp_node_bokehimage_out);
+  node_type_init(&ntype, node_composit_init_bokehimage);
+  node_type_storage(
+      &ntype, "NodeBokehImage", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_boxmask.c b/source/blender/nodes/composite/nodes/node_composite_boxmask.c
index 071d0941113..326f4a026da 100644
--- a/source/blender/nodes/composite/nodes/node_composite_boxmask.c
+++ b/source/blender/nodes/composite/nodes/node_composite_boxmask.c
@@ -21,40 +21,36 @@
  * \ingroup cmpnodes
  */
 
-
 #include "../node_composite_util.h"
 
 /* **************** SCALAR MATH ******************** */
 static bNodeSocketTemplate cmp_node_boxmask_in[] = {
-	{	SOCK_FLOAT, 1, N_("Mask"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 1, N_("Value"), 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
-	{   -1, 0, "" }
-};
+    {SOCK_FLOAT, 1, N_("Mask"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
+    {SOCK_FLOAT, 1, N_("Value"), 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
+    {-1, 0, ""}};
 
 static bNodeSocketTemplate cmp_node_boxmask_out[] = {
-	{	SOCK_FLOAT, 0, N_("Mask"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
-	{   -1, 0, "" }
-};
+    {SOCK_FLOAT, 0, N_("Mask"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f}, {-1, 0, ""}};
 
 static void node_composit_init_boxmask(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeBoxMask *data = MEM_callocN(sizeof(NodeBoxMask), "NodeBoxMask");
-	data->x = 0.5;
-	data->y = 0.5;
-	data->width = 0.2;
-	data->height = 0.1;
-	data->rotation = 0.0;
-	node->storage = data;
+  NodeBoxMask *data = MEM_callocN(sizeof(NodeBoxMask), "NodeBoxMask");
+  data->x = 0.5;
+  data->y = 0.5;
+  data->width = 0.2;
+  data->height = 0.1;
+  data->rotation = 0.0;
+  node->storage = data;
 }
 
 void register_node_type_cmp_boxmask(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_MASK_BOX, "Box Mask", NODE_CLASS_MATTE, 0);
-	node_type_socket_templates(&ntype, cmp_node_boxmask_in, cmp_node_boxmask_out);
-	node_type_init(&ntype, node_composit_init_boxmask);
-	node_type_storage(&ntype, "NodeBoxMask", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(&ntype, CMP_NODE_MASK_BOX, "Box Mask", NODE_CLASS_MATTE, 0);
+  node_type_socket_templates(&ntype, cmp_node_boxmask_in, cmp_node_boxmask_out);
+  node_type_init(&ntype, node_composit_init_boxmask);
+  node_type_storage(&ntype, "NodeBoxMask", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_brightness.c b/source/blender/nodes/composite/nodes/node_composite_brightness.c
index dba8d30df68..14c4dc099c9 100644
--- a/source/blender/nodes/composite/nodes/node_composite_brightness.c
+++ b/source/blender/nodes/composite/nodes/node_composite_brightness.c
@@ -21,35 +21,33 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
-
 /* **************** Brigh and contrsast  ******************** */
 
 static bNodeSocketTemplate cmp_node_brightcontrast_in[] = {
-	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_FLOAT, 1, N_("Bright"),		0.0f, 0.0f, 0.0f, 0.0f, -100.0f, 100.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, N_("Contrast"),		0.0f, 0.0f, 0.0f, 0.0f, -100.0f, 100.0f, PROP_NONE},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {SOCK_FLOAT, 1, N_("Bright"), 0.0f, 0.0f, 0.0f, 0.0f, -100.0f, 100.0f, PROP_NONE},
+    {SOCK_FLOAT, 1, N_("Contrast"), 0.0f, 0.0f, 0.0f, 0.0f, -100.0f, 100.0f, PROP_NONE},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate cmp_node_brightcontrast_out[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 static void node_composit_init_brightcontrast(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	node->custom1 = 1;
+  node->custom1 = 1;
 }
 
 void register_node_type_cmp_brightcontrast(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_BRIGHTCONTRAST, "Bright/Contrast", NODE_CLASS_OP_COLOR, 0);
-	node_type_socket_templates(&ntype, cmp_node_brightcontrast_in, cmp_node_brightcontrast_out);
-	node_type_init(&ntype, node_composit_init_brightcontrast);
+  cmp_node_type_base(&ntype, CMP_NODE_BRIGHTCONTRAST, "Bright/Contrast", NODE_CLASS_OP_COLOR, 0);
+  node_type_socket_templates(&ntype, cmp_node_brightcontrast_in, cmp_node_brightcontrast_out);
+  node_type_init(&ntype, node_composit_init_brightcontrast);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_channelMatte.c b/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
index 9468169e2a8..39fa5140cfd 100644
--- a/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
@@ -21,45 +21,44 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
-
 /* ******************* Channel Matte Node ********************************* */
 static bNodeSocketTemplate cmp_node_channel_matte_in[] = {
-	{SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
-	{-1, 0, ""},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {-1, 0, ""},
 };
 
 static bNodeSocketTemplate cmp_node_channel_matte_out[] = {
-	{SOCK_RGBA, 0, N_("Image")},
-	{SOCK_FLOAT, 0, N_("Matte")},
-	{-1, 0, ""},
+    {SOCK_RGBA, 0, N_("Image")},
+    {SOCK_FLOAT, 0, N_("Matte")},
+    {-1, 0, ""},
 };
 
 static void node_composit_init_channel_matte(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeChroma *c = MEM_callocN(sizeof(NodeChroma), "node chroma");
-	node->storage = c;
-	c->t1 = 1.0f;
-	c->t2 = 0.0f;
-	c->t3 = 0.0f;
-	c->fsize = 0.0f;
-	c->fstrength = 0.0f;
-	c->algorithm = 1; /*max channel limiting */
-	c->channel = 1; /* limit by red */
-	node->custom1 = 1; /* RGB channel */
-	node->custom2 = 2; /* Green Channel */
+  NodeChroma *c = MEM_callocN(sizeof(NodeChroma), "node chroma");
+  node->storage = c;
+  c->t1 = 1.0f;
+  c->t2 = 0.0f;
+  c->t3 = 0.0f;
+  c->fsize = 0.0f;
+  c->fstrength = 0.0f;
+  c->algorithm = 1;  /*max channel limiting */
+  c->channel = 1;    /* limit by red */
+  node->custom1 = 1; /* RGB channel */
+  node->custom2 = 2; /* Green Channel */
 }
 
 void register_node_type_cmp_channel_matte(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_CHANNEL_MATTE, "Channel Key", NODE_CLASS_MATTE, NODE_PREVIEW);
-	node_type_socket_templates(&ntype, cmp_node_channel_matte_in, cmp_node_channel_matte_out);
-	node_type_init(&ntype, node_composit_init_channel_matte);
-	node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(
+      &ntype, CMP_NODE_CHANNEL_MATTE, "Channel Key", NODE_CLASS_MATTE, NODE_PREVIEW);
+  node_type_socket_templates(&ntype, cmp_node_channel_matte_in, cmp_node_channel_matte_out);
+  node_type_init(&ntype, node_composit_init_channel_matte);
+  node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c b/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
index eda217067e1..a15c6781f7d 100644
--- a/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
@@ -21,41 +21,40 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 /* ******************* Chroma Key ********************************************************** */
 static bNodeSocketTemplate cmp_node_chroma_in[] = {
-	{SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
-	{SOCK_RGBA, 1, N_("Key Color"), 1.0f, 1.0f, 1.0f, 1.0f},
-	{-1, 0, ""},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {SOCK_RGBA, 1, N_("Key Color"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {-1, 0, ""},
 };
 
 static bNodeSocketTemplate cmp_node_chroma_out[] = {
-	{SOCK_RGBA, 0, N_("Image")},
-	{SOCK_FLOAT, 0, N_("Matte")},
-	{-1, 0, ""},
+    {SOCK_RGBA, 0, N_("Image")},
+    {SOCK_FLOAT, 0, N_("Matte")},
+    {-1, 0, ""},
 };
 
 static void node_composit_init_chroma_matte(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeChroma *c = MEM_callocN(sizeof(NodeChroma), "node chroma");
-	node->storage = c;
-	c->t1 = DEG2RADF(30.0f);
-	c->t2 = DEG2RADF(10.0f);
-	c->t3 = 0.0f;
-	c->fsize = 0.0f;
-	c->fstrength = 1.0f;
+  NodeChroma *c = MEM_callocN(sizeof(NodeChroma), "node chroma");
+  node->storage = c;
+  c->t1 = DEG2RADF(30.0f);
+  c->t2 = DEG2RADF(10.0f);
+  c->t3 = 0.0f;
+  c->fsize = 0.0f;
+  c->fstrength = 1.0f;
 }
 
 void register_node_type_cmp_chroma_matte(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_CHROMA_MATTE, "Chroma Key", NODE_CLASS_MATTE, NODE_PREVIEW);
-	node_type_socket_templates(&ntype, cmp_node_chroma_in, cmp_node_chroma_out);
-	node_type_init(&ntype, node_composit_init_chroma_matte);
-	node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(&ntype, CMP_NODE_CHROMA_MATTE, "Chroma Key", NODE_CLASS_MATTE, NODE_PREVIEW);
+  node_type_socket_templates(&ntype, cmp_node_chroma_in, cmp_node_chroma_out);
+  node_type_init(&ntype, node_composit_init_chroma_matte);
+  node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_colorMatte.c b/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
index cb13603ea34..559bcbd02bf 100644
--- a/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
@@ -21,41 +21,40 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 /* ******************* Color Key ********************************************************** */
 static bNodeSocketTemplate cmp_node_color_in[] = {
-	{SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
-	{SOCK_RGBA, 1, N_("Key Color"), 1.0f, 1.0f, 1.0f, 1.0f},
-	{-1, 0, ""},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {SOCK_RGBA, 1, N_("Key Color"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {-1, 0, ""},
 };
 
 static bNodeSocketTemplate cmp_node_color_out[] = {
-	{SOCK_RGBA, 0, N_("Image")},
-	{SOCK_FLOAT, 0, N_("Matte")},
-	{-1, 0, ""},
+    {SOCK_RGBA, 0, N_("Image")},
+    {SOCK_FLOAT, 0, N_("Matte")},
+    {-1, 0, ""},
 };
 
 static void node_composit_init_color_matte(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeChroma *c = MEM_callocN(sizeof(NodeChroma), "node color");
-	node->storage = c;
-	c->t1 = 0.01f;
-	c->t2 = 0.1f;
-	c->t3 = 0.1f;
-	c->fsize = 0.0f;
-	c->fstrength = 1.0f;
+  NodeChroma *c = MEM_callocN(sizeof(NodeChroma), "node color");
+  node->storage = c;
+  c->t1 = 0.01f;
+  c->t2 = 0.1f;
+  c->t3 = 0.1f;
+  c->fsize = 0.0f;
+  c->fstrength = 1.0f;
 }
 
 void register_node_type_cmp_color_matte(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_COLOR_MATTE, "Color Key", NODE_CLASS_MATTE, NODE_PREVIEW);
-	node_type_socket_templates(&ntype, cmp_node_color_in, cmp_node_color_out);
-	node_type_init(&ntype, node_composit_init_color_matte);
-	node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(&ntype, CMP_NODE_COLOR_MATTE, "Color Key", NODE_CLASS_MATTE, NODE_PREVIEW);
+  node_type_socket_templates(&ntype, cmp_node_color_in, cmp_node_color_out);
+  node_type_init(&ntype, node_composit_init_color_matte);
+  node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_colorSpill.c b/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
index 10009dd4e1c..d47cf72f086 100644
--- a/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
+++ b/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
@@ -25,35 +25,36 @@
 
 /* ******************* Color Spill Supression ********************************* */
 static bNodeSocketTemplate cmp_node_color_spill_in[] = {
-	{SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
-	{SOCK_FLOAT, 1, N_("Fac"),	1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
-	{-1, 0, ""},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {SOCK_FLOAT, 1, N_("Fac"), 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
+    {-1, 0, ""},
 };
 
 static bNodeSocketTemplate cmp_node_color_spill_out[] = {
-	{SOCK_RGBA, 0, N_("Image")},
-	{-1, 0, ""},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 static void node_composit_init_color_spill(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeColorspill *ncs = MEM_callocN(sizeof(NodeColorspill), "node colorspill");
-	node->storage = ncs;
-	node->custom1 = 2; /* green channel */
-	node->custom2 = 0; /* simple limit algo*/
-	ncs->limchan = 0;  /* limit by red */
-	ncs->limscale = 1.0f; /* limit scaling factor */
-	ncs->unspill = 0;   /* do not use unspill */
+  NodeColorspill *ncs = MEM_callocN(sizeof(NodeColorspill), "node colorspill");
+  node->storage = ncs;
+  node->custom1 = 2;    /* green channel */
+  node->custom2 = 0;    /* simple limit algo*/
+  ncs->limchan = 0;     /* limit by red */
+  ncs->limscale = 1.0f; /* limit scaling factor */
+  ncs->unspill = 0;     /* do not use unspill */
 }
 
 void register_node_type_cmp_color_spill(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_COLOR_SPILL, "Color Spill", NODE_CLASS_MATTE, 0);
-	node_type_socket_templates(&ntype, cmp_node_color_spill_in, cmp_node_color_spill_out);
-	node_type_init(&ntype, node_composit_init_color_spill);
-	node_type_storage(&ntype, "NodeColorspill", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(&ntype, CMP_NODE_COLOR_SPILL, "Color Spill", NODE_CLASS_MATTE, 0);
+  node_type_socket_templates(&ntype, cmp_node_color_spill_in, cmp_node_color_spill_out);
+  node_type_init(&ntype, node_composit_init_color_spill);
+  node_type_storage(
+      &ntype, "NodeColorspill", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_colorbalance.c b/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
index 221b1e5192a..b0fbade8da4 100644
--- a/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
+++ b/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
@@ -25,14 +25,14 @@
 
 /* ******************* Color Balance ********************************* */
 static bNodeSocketTemplate cmp_node_colorbalance_in[] = {
-	{SOCK_FLOAT, 1, N_("Fac"),	1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
-	{SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
-	{-1, 0, ""},
+    {SOCK_FLOAT, 1, N_("Fac"), 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {-1, 0, ""},
 };
 
 static bNodeSocketTemplate cmp_node_colorbalance_out[] = {
-	{SOCK_RGBA, 0, N_("Image")},
-	{-1, 0, ""},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 /* Sync functions update formula parameters for other modes, such that the result is comparable.
@@ -42,51 +42,52 @@ static bNodeSocketTemplate cmp_node_colorbalance_out[] = {
 
 void ntreeCompositColorBalanceSyncFromLGG(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeColorBalance *n = node->storage;
-	int c;
+  NodeColorBalance *n = node->storage;
+  int c;
 
-	for (c = 0; c < 3; ++c) {
-		n->slope[c] = (2.0f - n->lift[c]) * n->gain[c];
-		n->offset[c] = (n->lift[c] - 1.0f) * n->gain[c];
-		n->power[c] = (n->gamma[c] != 0.0f) ? 1.0f / n->gamma[c] : 1000000.0f;
-	}
+  for (c = 0; c < 3; ++c) {
+    n->slope[c] = (2.0f - n->lift[c]) * n->gain[c];
+    n->offset[c] = (n->lift[c] - 1.0f) * n->gain[c];
+    n->power[c] = (n->gamma[c] != 0.0f) ? 1.0f / n->gamma[c] : 1000000.0f;
+  }
 }
 
 void ntreeCompositColorBalanceSyncFromCDL(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeColorBalance *n = node->storage;
-	int c;
+  NodeColorBalance *n = node->storage;
+  int c;
 
-	for (c = 0; c < 3; ++c) {
-		float d = n->slope[c] + n->offset[c];
-		n->lift[c] = (d != 0.0f ? n->slope[c] + 2.0f * n->offset[c] / d : 0.0f);
-		n->gain[c] = d;
-		n->gamma[c] = (n->power[c] != 0.0f) ? 1.0f / n->power[c] : 1000000.0f;
-	}
+  for (c = 0; c < 3; ++c) {
+    float d = n->slope[c] + n->offset[c];
+    n->lift[c] = (d != 0.0f ? n->slope[c] + 2.0f * n->offset[c] / d : 0.0f);
+    n->gain[c] = d;
+    n->gamma[c] = (n->power[c] != 0.0f) ? 1.0f / n->power[c] : 1000000.0f;
+  }
 }
 
 static void node_composit_init_colorbalance(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeColorBalance *n = node->storage = MEM_callocN(sizeof(NodeColorBalance), "node colorbalance");
+  NodeColorBalance *n = node->storage = MEM_callocN(sizeof(NodeColorBalance), "node colorbalance");
 
-	n->lift[0] = n->lift[1] = n->lift[2] = 1.0f;
-	n->gamma[0] = n->gamma[1] = n->gamma[2] = 1.0f;
-	n->gain[0] = n->gain[1] = n->gain[2] = 1.0f;
+  n->lift[0] = n->lift[1] = n->lift[2] = 1.0f;
+  n->gamma[0] = n->gamma[1] = n->gamma[2] = 1.0f;
+  n->gain[0] = n->gain[1] = n->gain[2] = 1.0f;
 
-	n->slope[0] = n->slope[1] = n->slope[2] = 1.0f;
-	n->offset[0] = n->offset[1] = n->offset[2] = 0.0f;
-	n->power[0] = n->power[1] = n->power[2] = 1.0f;
+  n->slope[0] = n->slope[1] = n->slope[2] = 1.0f;
+  n->offset[0] = n->offset[1] = n->offset[2] = 0.0f;
+  n->power[0] = n->power[1] = n->power[2] = 1.0f;
 }
 
 void register_node_type_cmp_colorbalance(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_COLORBALANCE, "Color Balance", NODE_CLASS_OP_COLOR, 0);
-	node_type_socket_templates(&ntype, cmp_node_colorbalance_in, cmp_node_colorbalance_out);
-	node_type_size(&ntype, 400, 200, 400);
-	node_type_init(&ntype, node_composit_init_colorbalance);
-	node_type_storage(&ntype, "NodeColorBalance", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(&ntype, CMP_NODE_COLORBALANCE, "Color Balance", NODE_CLASS_OP_COLOR, 0);
+  node_type_socket_templates(&ntype, cmp_node_colorbalance_in, cmp_node_colorbalance_out);
+  node_type_size(&ntype, 400, 200, 400);
+  node_type_init(&ntype, node_composit_init_colorbalance);
+  node_type_storage(
+      &ntype, "NodeColorBalance", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c b/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
index 0d7fe67764d..c333553577d 100644
--- a/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
+++ b/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
@@ -23,56 +23,57 @@
 
 #include "node_composite_util.h"
 
-
 /* ******************* Color Balance ********************************* */
 static bNodeSocketTemplate cmp_node_colorcorrection_in[] = {
-	{	SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_FLOAT, 1, N_("Mask"),	1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	-1, 0, ""},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {SOCK_FLOAT, 1, N_("Mask"), 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+    {-1, 0, ""},
 };
 
 static bNodeSocketTemplate cmp_node_colorcorrection_out[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	-1, 0, ""},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 static void node_composit_init_colorcorrection(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeColorCorrection *n = node->storage = MEM_callocN(sizeof(NodeColorCorrection), "node colorcorrection");
-	n->startmidtones = 0.2f;
-	n->endmidtones = 0.7f;
-	n->master.contrast = 1.0f;
-	n->master.gain = 1.0f;
-	n->master.gamma = 1.0f;
-	n->master.lift = 0.0f;
-	n->master.saturation = 1.0f;
-	n->midtones.contrast = 1.0f;
-	n->midtones.gain = 1.0f;
-	n->midtones.gamma = 1.0f;
-	n->midtones.lift = 0.0f;
-	n->midtones.saturation = 1.0f;
-	n->shadows.contrast = 1.0f;
-	n->shadows.gain = 1.0f;
-	n->shadows.gamma = 1.0f;
-	n->shadows.lift = 0.0f;
-	n->shadows.saturation = 1.0f;
-	n->highlights.contrast = 1.0f;
-	n->highlights.gain = 1.0f;
-	n->highlights.gamma = 1.0f;
-	n->highlights.lift = 0.0f;
-	n->highlights.saturation = 1.0f;
-	node->custom1 = 7; // red + green + blue enabled
+  NodeColorCorrection *n = node->storage = MEM_callocN(sizeof(NodeColorCorrection),
+                                                       "node colorcorrection");
+  n->startmidtones = 0.2f;
+  n->endmidtones = 0.7f;
+  n->master.contrast = 1.0f;
+  n->master.gain = 1.0f;
+  n->master.gamma = 1.0f;
+  n->master.lift = 0.0f;
+  n->master.saturation = 1.0f;
+  n->midtones.contrast = 1.0f;
+  n->midtones.gain = 1.0f;
+  n->midtones.gamma = 1.0f;
+  n->midtones.lift = 0.0f;
+  n->midtones.saturation = 1.0f;
+  n->shadows.contrast = 1.0f;
+  n->shadows.gain = 1.0f;
+  n->shadows.gamma = 1.0f;
+  n->shadows.lift = 0.0f;
+  n->shadows.saturation = 1.0f;
+  n->highlights.contrast = 1.0f;
+  n->highlights.gain = 1.0f;
+  n->highlights.gamma = 1.0f;
+  n->highlights.lift = 0.0f;
+  n->highlights.saturation = 1.0f;
+  node->custom1 = 7;  // red + green + blue enabled
 }
 
 void register_node_type_cmp_colorcorrection(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_COLORCORRECTION, "Color Correction", NODE_CLASS_OP_COLOR, 0);
-	node_type_socket_templates(&ntype, cmp_node_colorcorrection_in, cmp_node_colorcorrection_out);
-	node_type_size(&ntype, 400, 200, 600);
-	node_type_init(&ntype, node_composit_init_colorcorrection);
-	node_type_storage(&ntype, "NodeColorCorrection", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(&ntype, CMP_NODE_COLORCORRECTION, "Color Correction", NODE_CLASS_OP_COLOR, 0);
+  node_type_socket_templates(&ntype, cmp_node_colorcorrection_in, cmp_node_colorcorrection_out);
+  node_type_size(&ntype, 400, 200, 600);
+  node_type_init(&ntype, node_composit_init_colorcorrection);
+  node_type_storage(
+      &ntype, "NodeColorCorrection", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_common.c b/source/blender/nodes/composite/nodes/node_composite_common.c
index 480b9f1e989..78254cc7404 100644
--- a/source/blender/nodes/composite/nodes/node_composite_common.c
+++ b/source/blender/nodes/composite/nodes/node_composite_common.c
@@ -34,39 +34,40 @@
 
 void register_node_type_cmp_group(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	/* NB: cannot use sh_node_type_base for node group, because it would map the node type
-	 * to the shared NODE_GROUP integer type id.
-	 */
-	node_type_base_custom(&ntype, "CompositorNodeGroup", "Group", NODE_CLASS_GROUP, NODE_CONST_OUTPUT);
-	ntype.type = NODE_GROUP;
-	ntype.poll = cmp_node_poll_default;
-	ntype.poll_instance = node_group_poll_instance;
-	ntype.insert_link = node_insert_link_default;
-	ntype.update_internal_links = node_update_internal_links_default;
-	ntype.ext.srna = RNA_struct_find("CompositorNodeGroup");
-	BLI_assert(ntype.ext.srna != NULL);
-	RNA_struct_blender_type_set(ntype.ext.srna, &ntype);
+  /* NB: cannot use sh_node_type_base for node group, because it would map the node type
+   * to the shared NODE_GROUP integer type id.
+   */
+  node_type_base_custom(
+      &ntype, "CompositorNodeGroup", "Group", NODE_CLASS_GROUP, NODE_CONST_OUTPUT);
+  ntype.type = NODE_GROUP;
+  ntype.poll = cmp_node_poll_default;
+  ntype.poll_instance = node_group_poll_instance;
+  ntype.insert_link = node_insert_link_default;
+  ntype.update_internal_links = node_update_internal_links_default;
+  ntype.ext.srna = RNA_struct_find("CompositorNodeGroup");
+  BLI_assert(ntype.ext.srna != NULL);
+  RNA_struct_blender_type_set(ntype.ext.srna, &ntype);
 
-	node_type_socket_templates(&ntype, NULL, NULL);
-	node_type_size(&ntype, 140, 60, 400);
-	node_type_label(&ntype, node_group_label);
-	node_type_update(&ntype, NULL, node_group_verify);
+  node_type_socket_templates(&ntype, NULL, NULL);
+  node_type_size(&ntype, 140, 60, 400);
+  node_type_label(&ntype, node_group_label);
+  node_type_update(&ntype, NULL, node_group_verify);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
 
 void register_node_type_cmp_custom_group(bNodeType *ntype)
 {
-	/* These methods can be overriden but need a default implementation otherwise. */
-	if (ntype->poll == NULL) {
-		ntype->poll = cmp_node_poll_default;
-	}
-	if (ntype->insert_link == NULL) {
-		ntype->insert_link = node_insert_link_default;
-	}
-	if (ntype->update_internal_links == NULL) {
-		ntype->update_internal_links = node_update_internal_links_default;
-	}
+  /* These methods can be overriden but need a default implementation otherwise. */
+  if (ntype->poll == NULL) {
+    ntype->poll = cmp_node_poll_default;
+  }
+  if (ntype->insert_link == NULL) {
+    ntype->insert_link = node_insert_link_default;
+  }
+  if (ntype->update_internal_links == NULL) {
+    ntype->update_internal_links = node_update_internal_links_default;
+  }
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_composite.c b/source/blender/nodes/composite/nodes/node_composite_composite.c
index fbddeac4094..9a79d2da6ce 100644
--- a/source/blender/nodes/composite/nodes/node_composite_composite.c
+++ b/source/blender/nodes/composite/nodes/node_composite_composite.c
@@ -25,21 +25,21 @@
 
 /* **************** COMPOSITE ******************** */
 static bNodeSocketTemplate cmp_node_composite_in[] = {
-	{	SOCK_RGBA, 1, N_("Image"),		0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 1, N_("Alpha"),		1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, N_("Z"),			1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 1, N_("Image"), 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_FLOAT, 1, N_("Alpha"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
+    {SOCK_FLOAT, 1, N_("Z"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
+    {-1, 0, ""},
 };
 
 void register_node_type_cmp_composite(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_COMPOSITE, "Composite", NODE_CLASS_OUTPUT, NODE_PREVIEW);
-	node_type_socket_templates(&ntype, cmp_node_composite_in, NULL);
+  cmp_node_type_base(&ntype, CMP_NODE_COMPOSITE, "Composite", NODE_CLASS_OUTPUT, NODE_PREVIEW);
+  node_type_socket_templates(&ntype, cmp_node_composite_in, NULL);
 
-	/* Do not allow muting for this node. */
-	node_type_internal_links(&ntype, NULL);
+  /* Do not allow muting for this node. */
+  node_type_internal_links(&ntype, NULL);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_cornerpin.c b/source/blender/nodes/composite/nodes/node_composite_cornerpin.c
index f6320af4885..40523c4886e 100644
--- a/source/blender/nodes/composite/nodes/node_composite_cornerpin.c
+++ b/source/blender/nodes/composite/nodes/node_composite_cornerpin.c
@@ -21,30 +21,29 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 static bNodeSocketTemplate inputs[] = {
-	{   SOCK_RGBA,      1, N_("Image"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{   SOCK_VECTOR,    1, N_("Upper Left"), 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{   SOCK_VECTOR,    1, N_("Upper Right"), 1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{   SOCK_VECTOR,    1, N_("Lower Left"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{   SOCK_VECTOR,    1, N_("Lower Right"), 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{   -1, 0, ""   },
+    {SOCK_RGBA, 1, N_("Image"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+    {SOCK_VECTOR, 1, N_("Upper Left"), 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+    {SOCK_VECTOR, 1, N_("Upper Right"), 1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+    {SOCK_VECTOR, 1, N_("Lower Left"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+    {SOCK_VECTOR, 1, N_("Lower Right"), 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+    {-1, 0, ""},
 };
 
 static bNodeSocketTemplate outputs[] = {
-	{	SOCK_RGBA,   0,  N_("Image")},
-	{	SOCK_FLOAT,  0,  N_("Plane")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {SOCK_FLOAT, 0, N_("Plane")},
+    {-1, 0, ""},
 };
 
 void register_node_type_cmp_cornerpin(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_CORNERPIN, "Corner Pin", NODE_CLASS_DISTORT, 0);
-	node_type_socket_templates(&ntype, inputs, outputs);
+  cmp_node_type_base(&ntype, CMP_NODE_CORNERPIN, "Corner Pin", NODE_CLASS_DISTORT, 0);
+  node_type_socket_templates(&ntype, inputs, outputs);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_crop.c b/source/blender/nodes/composite/nodes/node_composite_crop.c
index e89fd4cdb2b..d3a7b47386a 100644
--- a/source/blender/nodes/composite/nodes/node_composite_crop.c
+++ b/source/blender/nodes/composite/nodes/node_composite_crop.c
@@ -21,38 +21,37 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 /* **************** Crop  ******************** */
 
 static bNodeSocketTemplate cmp_node_crop_in[] = {
-	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate cmp_node_crop_out[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 static void node_composit_init_crop(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeTwoXYs *nxy = MEM_callocN(sizeof(NodeTwoXYs), "node xy data");
-	node->storage = nxy;
-	nxy->x1 = 0;
-	nxy->x2 = 0;
-	nxy->y1 = 0;
-	nxy->y2 = 0;
+  NodeTwoXYs *nxy = MEM_callocN(sizeof(NodeTwoXYs), "node xy data");
+  node->storage = nxy;
+  nxy->x1 = 0;
+  nxy->x2 = 0;
+  nxy->y1 = 0;
+  nxy->y2 = 0;
 }
 
 void register_node_type_cmp_crop(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_CROP, "Crop", NODE_CLASS_DISTORT, 0);
-	node_type_socket_templates(&ntype, cmp_node_crop_in, cmp_node_crop_out);
-	node_type_init(&ntype, node_composit_init_crop);
-	node_type_storage(&ntype, "NodeTwoXYs", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(&ntype, CMP_NODE_CROP, "Crop", NODE_CLASS_DISTORT, 0);
+  node_type_socket_templates(&ntype, cmp_node_crop_in, cmp_node_crop_out);
+  node_type_init(&ntype, node_composit_init_crop);
+  node_type_storage(&ntype, "NodeTwoXYs", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.c b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.c
index 1569d27017e..729252f0937 100644
--- a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.c
@@ -31,264 +31,264 @@
 
 BLI_INLINE float hash_to_float(uint32_t hash)
 {
-	uint32_t mantissa = hash & ((1 << 23) - 1);
-	uint32_t exponent = (hash >> 23) & ((1 << 8) - 1);
-	exponent = MAX2(exponent, (uint32_t)1);
-	exponent = MIN2(exponent, (uint32_t)254);
-	exponent = exponent << 23;
-	uint32_t sign = (hash >> 31);
-	sign = sign << 31;
-	uint32_t float_bits = sign | exponent | mantissa;
-	float f;
-	/* Bit casting relies on equal size for both types. */
-	BLI_STATIC_ASSERT(sizeof(float) == sizeof(uint32_t), "float and uint32_t are not the same size")
-	memcpy(&f, &float_bits, sizeof(float));
-	return f;
+  uint32_t mantissa = hash & ((1 << 23) - 1);
+  uint32_t exponent = (hash >> 23) & ((1 << 8) - 1);
+  exponent = MAX2(exponent, (uint32_t)1);
+  exponent = MIN2(exponent, (uint32_t)254);
+  exponent = exponent << 23;
+  uint32_t sign = (hash >> 31);
+  sign = sign << 31;
+  uint32_t float_bits = sign | exponent | mantissa;
+  float f;
+  /* Bit casting relies on equal size for both types. */
+  BLI_STATIC_ASSERT(sizeof(float) == sizeof(uint32_t), "float and uint32_t are not the same size")
+  memcpy(&f, &float_bits, sizeof(float));
+  return f;
 }
 
 static void cryptomatte_add(NodeCryptomatte *n, float f)
 {
-	/* Turn the number into a string. */
-	char number[32];
-	BLI_snprintf(number, sizeof(number), "<%.9g>", f);
-
-	/* Search if we already have the number. */
-	if (n->matte_id && strlen(n->matte_id) != 0) {
-		size_t start = 0;
-		const size_t end = strlen(n->matte_id);
-		size_t token_len = 0;
-		while (start < end) {
-			/* Ignore leading whitespace. */
-			while (start < end && n->matte_id[start] == ' ') {
-				++start;
-			}
-
-			/* Find the next seprator. */
-			char *token_end = strchr(n->matte_id + start, ',');
-			if (token_end == NULL || token_end == n->matte_id + start) {
-				token_end = n->matte_id + end;
-			}
-			/* Be aware that token_len still contains any trailing white space. */
-			token_len = token_end - (n->matte_id + start);
-
-			/* If this has a leading bracket, assume a raw floating point number and look for the closing bracket. */
-			if (n->matte_id[start] == '<') {
-				if (strncmp(n->matte_id + start, number, strlen(number)) == 0) {
-					/* This number is already there, so continue. */
-					return;
-				}
-			}
-			else {
-				/* Remove trailing white space */
-				size_t name_len = token_len;
-				while (n->matte_id[start + name_len] == ' ' && name_len > 0) {
-					name_len--;
-				}
-				/* Calculate the hash of the token and compare. */
-				uint32_t hash = BLI_hash_mm3((const unsigned char *)(n->matte_id + start), name_len, 0);
-				if (f == hash_to_float(hash)) {
-					return;
-				}
-			}
-			start += token_len + 1;
-		}
-	}
-
-	DynStr *new_matte = BLI_dynstr_new();
-	if (!new_matte) {
-		return;
-	}
-
-	if (n->matte_id) {
-		BLI_dynstr_append(new_matte, n->matte_id);
-		MEM_freeN(n->matte_id);
-	}
-
-	if (BLI_dynstr_get_len(new_matte) > 0) {
-		BLI_dynstr_append(new_matte, ",");
-	}
-	BLI_dynstr_append(new_matte, number);
-	n->matte_id = BLI_dynstr_get_cstring(new_matte);
-	BLI_dynstr_free(new_matte);
+  /* Turn the number into a string. */
+  char number[32];
+  BLI_snprintf(number, sizeof(number), "<%.9g>", f);
+
+  /* Search if we already have the number. */
+  if (n->matte_id && strlen(n->matte_id) != 0) {
+    size_t start = 0;
+    const size_t end = strlen(n->matte_id);
+    size_t token_len = 0;
+    while (start < end) {
+      /* Ignore leading whitespace. */
+      while (start < end && n->matte_id[start] == ' ') {
+        ++start;
+      }
+
+      /* Find the next seprator. */
+      char *token_end = strchr(n->matte_id + start, ',');
+      if (token_end == NULL || token_end == n->matte_id + start) {
+        token_end = n->matte_id + end;
+      }
+      /* Be aware that token_len still contains any trailing white space. */
+      token_len = token_end - (n->matte_id + start);
+
+      /* If this has a leading bracket, assume a raw floating point number and look for the closing bracket. */
+      if (n->matte_id[start] == '<') {
+        if (strncmp(n->matte_id + start, number, strlen(number)) == 0) {
+          /* This number is already there, so continue. */
+          return;
+        }
+      }
+      else {
+        /* Remove trailing white space */
+        size_t name_len = token_len;
+        while (n->matte_id[start + name_len] == ' ' && name_len > 0) {
+          name_len--;
+        }
+        /* Calculate the hash of the token and compare. */
+        uint32_t hash = BLI_hash_mm3((const unsigned char *)(n->matte_id + start), name_len, 0);
+        if (f == hash_to_float(hash)) {
+          return;
+        }
+      }
+      start += token_len + 1;
+    }
+  }
+
+  DynStr *new_matte = BLI_dynstr_new();
+  if (!new_matte) {
+    return;
+  }
+
+  if (n->matte_id) {
+    BLI_dynstr_append(new_matte, n->matte_id);
+    MEM_freeN(n->matte_id);
+  }
+
+  if (BLI_dynstr_get_len(new_matte) > 0) {
+    BLI_dynstr_append(new_matte, ",");
+  }
+  BLI_dynstr_append(new_matte, number);
+  n->matte_id = BLI_dynstr_get_cstring(new_matte);
+  BLI_dynstr_free(new_matte);
 }
 
 static void cryptomatte_remove(NodeCryptomatte *n, float f)
 {
-	if (n->matte_id == NULL || strlen(n->matte_id) == 0) {
-		/* Empty string, nothing to remove. */
-		return;
-	}
-
-	/* This will be the new string without the removed key. */
-	DynStr *new_matte = BLI_dynstr_new();
-	if (!new_matte) {
-		return;
-	}
-
-	/* Turn the number into a string. */
-	static char number[32];
-	BLI_snprintf(number, sizeof(number), "<%.9g>", f);
-
-	/* Search if we already have the number. */
-	size_t start = 0;
-	const size_t end = strlen(n->matte_id);
-	size_t token_len = 0;
-	bool is_first = true;
-	while (start < end) {
-		bool skip = false;
-		/* Ignore leading whitespace or commas. */
-		while (start < end && ((n->matte_id[start] == ' ') || (n->matte_id[start] == ','))) {
-			++start;
-		}
-
-		/* Find the next seprator. */
-		char *token_end = strchr(n->matte_id + start + 1, ',');
-		if (token_end == NULL || token_end == n->matte_id + start) {
-			token_end = n->matte_id + end;
-		}
-		/* Be aware that token_len still contains any trailing white space. */
-		token_len = token_end - (n->matte_id + start);
-
-		if (token_len == 1) {
-			skip = true;
-		}
-		/* If this has a leading bracket, assume a raw floating point number and look for the closing bracket. */
-		else if (n->matte_id[start] == '<') {
-			if (strncmp(n->matte_id + start, number, strlen(number)) == 0) {
-				/* This number is already there, so skip it. */
-				skip = true;
-			}
-		}
-		else {
-			/* Remove trailing white space */
-			size_t name_len = token_len;
-			while (n->matte_id[start + name_len] == ' ' && name_len > 0) {
-				name_len--;
-			}
-			/* Calculate the hash of the token and compare. */
-			uint32_t hash = BLI_hash_mm3((const unsigned char *)(n->matte_id + start), name_len, 0);
-			if (f == hash_to_float(hash)) {
-				skip = true;
-			}
-		}
-		if (!skip) {
-			if (is_first) {
-				is_first = false;
-			}
-			else {
-				BLI_dynstr_append(new_matte, ", ");
-			}
-			BLI_dynstr_nappend(new_matte, n->matte_id + start, token_len);
-		}
-		start += token_len + 1;
-	}
-
-	if (n->matte_id) {
-		MEM_freeN(n->matte_id);
-		n->matte_id = NULL;
-	}
-	if (BLI_dynstr_get_len(new_matte) > 0) {
-		n->matte_id = BLI_dynstr_get_cstring(new_matte);
-	}
-	BLI_dynstr_free(new_matte);
+  if (n->matte_id == NULL || strlen(n->matte_id) == 0) {
+    /* Empty string, nothing to remove. */
+    return;
+  }
+
+  /* This will be the new string without the removed key. */
+  DynStr *new_matte = BLI_dynstr_new();
+  if (!new_matte) {
+    return;
+  }
+
+  /* Turn the number into a string. */
+  static char number[32];
+  BLI_snprintf(number, sizeof(number), "<%.9g>", f);
+
+  /* Search if we already have the number. */
+  size_t start = 0;
+  const size_t end = strlen(n->matte_id);
+  size_t token_len = 0;
+  bool is_first = true;
+  while (start < end) {
+    bool skip = false;
+    /* Ignore leading whitespace or commas. */
+    while (start < end && ((n->matte_id[start] == ' ') || (n->matte_id[start] == ','))) {
+      ++start;
+    }
+
+    /* Find the next seprator. */
+    char *token_end = strchr(n->matte_id + start + 1, ',');
+    if (token_end == NULL || token_end == n->matte_id + start) {
+      token_end = n->matte_id + end;
+    }
+    /* Be aware that token_len still contains any trailing white space. */
+    token_len = token_end - (n->matte_id + start);
+
+    if (token_len == 1) {
+      skip = true;
+    }
+    /* If this has a leading bracket, assume a raw floating point number and look for the closing bracket. */
+    else if (n->matte_id[start] == '<') {
+      if (strncmp(n->matte_id + start, number, strlen(number)) == 0) {
+        /* This number is already there, so skip it. */
+        skip = true;
+      }
+    }
+    else {
+      /* Remove trailing white space */
+      size_t name_len = token_len;
+      while (n->matte_id[start + name_len] == ' ' && name_len > 0) {
+        name_len--;
+      }
+      /* Calculate the hash of the token and compare. */
+      uint32_t hash = BLI_hash_mm3((const unsigned char *)(n->matte_id + start), name_len, 0);
+      if (f == hash_to_float(hash)) {
+        skip = true;
+      }
+    }
+    if (!skip) {
+      if (is_first) {
+        is_first = false;
+      }
+      else {
+        BLI_dynstr_append(new_matte, ", ");
+      }
+      BLI_dynstr_nappend(new_matte, n->matte_id + start, token_len);
+    }
+    start += token_len + 1;
+  }
+
+  if (n->matte_id) {
+    MEM_freeN(n->matte_id);
+    n->matte_id = NULL;
+  }
+  if (BLI_dynstr_get_len(new_matte) > 0) {
+    n->matte_id = BLI_dynstr_get_cstring(new_matte);
+  }
+  BLI_dynstr_free(new_matte);
 }
 
 static bNodeSocketTemplate outputs[] = {
-	{   SOCK_RGBA,  0, N_("Image")},
-	{   SOCK_FLOAT, 0, N_("Matte")},
-	{   SOCK_RGBA,  0, N_("Pick")},
-	{   -1, 0, ""   },
+    {SOCK_RGBA, 0, N_("Image")},
+    {SOCK_FLOAT, 0, N_("Matte")},
+    {SOCK_RGBA, 0, N_("Pick")},
+    {-1, 0, ""},
 };
 
 void ntreeCompositCryptomatteSyncFromAdd(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeCryptomatte *n = node->storage;
-	if (n->add[0] != 0.0f) {
-		cryptomatte_add(n, n->add[0]);
-		n->add[0] = 0.0f;
-		n->add[1] = 0.0f;
-		n->add[2] = 0.0f;
-	}
+  NodeCryptomatte *n = node->storage;
+  if (n->add[0] != 0.0f) {
+    cryptomatte_add(n, n->add[0]);
+    n->add[0] = 0.0f;
+    n->add[1] = 0.0f;
+    n->add[2] = 0.0f;
+  }
 }
 
 void ntreeCompositCryptomatteSyncFromRemove(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeCryptomatte *n = node->storage;
-	if (n->remove[0] != 0.0f) {
-		cryptomatte_remove(n, n->remove[0]);
-		n->remove[0] = 0.0f;
-		n->remove[1] = 0.0f;
-		n->remove[2] = 0.0f;
-	}
+  NodeCryptomatte *n = node->storage;
+  if (n->remove[0] != 0.0f) {
+    cryptomatte_remove(n, n->remove[0]);
+    n->remove[0] = 0.0f;
+    n->remove[1] = 0.0f;
+    n->remove[2] = 0.0f;
+  }
 }
 
 bNodeSocket *ntreeCompositCryptomatteAddSocket(bNodeTree *ntree, bNode *node)
 {
-	NodeCryptomatte *n = node->storage;
-	char sockname[32];
-	n->num_inputs++;
-	BLI_snprintf(sockname, sizeof(sockname), "Crypto %.2d", n->num_inputs - 1);
-	bNodeSocket *sock = nodeAddStaticSocket(ntree, node, SOCK_IN, SOCK_RGBA, PROP_NONE, NULL, sockname);
-	return sock;
+  NodeCryptomatte *n = node->storage;
+  char sockname[32];
+  n->num_inputs++;
+  BLI_snprintf(sockname, sizeof(sockname), "Crypto %.2d", n->num_inputs - 1);
+  bNodeSocket *sock = nodeAddStaticSocket(
+      ntree, node, SOCK_IN, SOCK_RGBA, PROP_NONE, NULL, sockname);
+  return sock;
 }
 
 int ntreeCompositCryptomatteRemoveSocket(bNodeTree *ntree, bNode *node)
 {
-	NodeCryptomatte *n = node->storage;
-	if (n->num_inputs < 2) {
-		return 0;
-	}
-	bNodeSocket *sock = node->inputs.last;
-	nodeRemoveSocket(ntree, node, sock);
-	n->num_inputs--;
-	return 1;
+  NodeCryptomatte *n = node->storage;
+  if (n->num_inputs < 2) {
+    return 0;
+  }
+  bNodeSocket *sock = node->inputs.last;
+  nodeRemoveSocket(ntree, node, sock);
+  n->num_inputs--;
+  return 1;
 }
 
 static void init(bNodeTree *ntree, bNode *node)
 {
-	NodeCryptomatte *user = MEM_callocN(sizeof(NodeCryptomatte), "cryptomatte user");
-	node->storage = user;
+  NodeCryptomatte *user = MEM_callocN(sizeof(NodeCryptomatte), "cryptomatte user");
+  node->storage = user;
 
+  nodeAddStaticSocket(ntree, node, SOCK_IN, SOCK_RGBA, PROP_NONE, "image", "Image");
 
-	nodeAddStaticSocket(ntree, node, SOCK_IN, SOCK_RGBA, PROP_NONE, "image", "Image");
-
-	/* Add three inputs by default, as recommended by the Cryptomatte specification. */
-	ntreeCompositCryptomatteAddSocket(ntree, node);
-	ntreeCompositCryptomatteAddSocket(ntree, node);
-	ntreeCompositCryptomatteAddSocket(ntree, node);
+  /* Add three inputs by default, as recommended by the Cryptomatte specification. */
+  ntreeCompositCryptomatteAddSocket(ntree, node);
+  ntreeCompositCryptomatteAddSocket(ntree, node);
+  ntreeCompositCryptomatteAddSocket(ntree, node);
 }
 
 static void node_free_cryptomatte(bNode *node)
 {
-	NodeCryptomatte *nc = node->storage;
+  NodeCryptomatte *nc = node->storage;
 
-	if (nc) {
-		if (nc->matte_id) {
-			MEM_freeN(nc->matte_id);
-		}
+  if (nc) {
+    if (nc->matte_id) {
+      MEM_freeN(nc->matte_id);
+    }
 
-		MEM_freeN(nc);
-	}
+    MEM_freeN(nc);
+  }
 }
 
 static void node_copy_cryptomatte(bNodeTree *UNUSED(dest_ntree), bNode *dest_node, bNode *src_node)
 {
-	NodeCryptomatte *src_nc = src_node->storage;
-	NodeCryptomatte *dest_nc = MEM_dupallocN(src_nc);
+  NodeCryptomatte *src_nc = src_node->storage;
+  NodeCryptomatte *dest_nc = MEM_dupallocN(src_nc);
 
-	if (src_nc->matte_id)
-		dest_nc->matte_id = MEM_dupallocN(src_nc->matte_id);
+  if (src_nc->matte_id)
+    dest_nc->matte_id = MEM_dupallocN(src_nc->matte_id);
 
-	dest_node->storage = dest_nc;
+  dest_node->storage = dest_nc;
 }
 
 void register_node_type_cmp_cryptomatte(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_CRYPTOMATTE, "Cryptomatte", NODE_CLASS_CONVERTOR, 0);
-	node_type_socket_templates(&ntype, NULL, outputs);
-	node_type_init(&ntype, init);
-	node_type_storage(&ntype, "NodeCryptomatte", node_free_cryptomatte, node_copy_cryptomatte);
-	nodeRegisterType(&ntype);
+  cmp_node_type_base(&ntype, CMP_NODE_CRYPTOMATTE, "Cryptomatte", NODE_CLASS_CONVERTOR, 0);
+  node_type_socket_templates(&ntype, NULL, outputs);
+  node_type_init(&ntype, init);
+  node_type_storage(&ntype, "NodeCryptomatte", node_free_cryptomatte, node_copy_cryptomatte);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_curves.c b/source/blender/nodes/composite/nodes/node_composite_curves.c
index b1c59bf0b17..7b2e7329432 100644
--- a/source/blender/nodes/composite/nodes/node_composite_curves.c
+++ b/source/blender/nodes/composite/nodes/node_composite_curves.c
@@ -21,98 +21,93 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
-
 /* **************** CURVE Time  ******************** */
 
 /* custom1 = sfra, custom2 = efra */
 static bNodeSocketTemplate cmp_node_time_out[] = {
-	{	SOCK_FLOAT, 0, N_("Fac")},
-	{	-1, 0, ""	},
+    {SOCK_FLOAT, 0, N_("Fac")},
+    {-1, 0, ""},
 };
 
 static void node_composit_init_curves_time(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	node->custom1 = 1;
-	node->custom2 = 250;
-	node->storage = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
+  node->custom1 = 1;
+  node->custom2 = 250;
+  node->storage = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
 }
 
 void register_node_type_cmp_curve_time(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_TIME, "Time", NODE_CLASS_INPUT, 0);
-	node_type_socket_templates(&ntype, NULL, cmp_node_time_out);
-	node_type_size(&ntype, 140, 100, 320);
-	node_type_init(&ntype, node_composit_init_curves_time);
-	node_type_storage(&ntype, "CurveMapping", node_free_curves, node_copy_curves);
+  cmp_node_type_base(&ntype, CMP_NODE_TIME, "Time", NODE_CLASS_INPUT, 0);
+  node_type_socket_templates(&ntype, NULL, cmp_node_time_out);
+  node_type_size(&ntype, 140, 100, 320);
+  node_type_init(&ntype, node_composit_init_curves_time);
+  node_type_storage(&ntype, "CurveMapping", node_free_curves, node_copy_curves);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
 
-
-
 /* **************** CURVE VEC  ******************** */
 static bNodeSocketTemplate cmp_node_curve_vec_in[] = {
-	{	SOCK_VECTOR, 1, N_("Vector"),	0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_NONE},
-	{	-1, 0, ""	},
+    {SOCK_VECTOR, 1, N_("Vector"), 0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_NONE},
+    {-1, 0, ""},
 };
 
 static bNodeSocketTemplate cmp_node_curve_vec_out[] = {
-	{	SOCK_VECTOR, 0, N_("Vector")},
-	{	-1, 0, ""	},
+    {SOCK_VECTOR, 0, N_("Vector")},
+    {-1, 0, ""},
 };
 
 static void node_composit_init_curve_vec(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	node->storage = curvemapping_add(3, -1.0f, -1.0f, 1.0f, 1.0f);
+  node->storage = curvemapping_add(3, -1.0f, -1.0f, 1.0f, 1.0f);
 }
 
 void register_node_type_cmp_curve_vec(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_CURVE_VEC, "Vector Curves", NODE_CLASS_OP_VECTOR, 0);
-	node_type_socket_templates(&ntype, cmp_node_curve_vec_in, cmp_node_curve_vec_out);
-	node_type_size(&ntype, 200, 140, 320);
-	node_type_init(&ntype, node_composit_init_curve_vec);
-	node_type_storage(&ntype, "CurveMapping", node_free_curves, node_copy_curves);
+  cmp_node_type_base(&ntype, CMP_NODE_CURVE_VEC, "Vector Curves", NODE_CLASS_OP_VECTOR, 0);
+  node_type_socket_templates(&ntype, cmp_node_curve_vec_in, cmp_node_curve_vec_out);
+  node_type_size(&ntype, 200, 140, 320);
+  node_type_init(&ntype, node_composit_init_curve_vec);
+  node_type_storage(&ntype, "CurveMapping", node_free_curves, node_copy_curves);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
 
-
 /* **************** CURVE RGB  ******************** */
 static bNodeSocketTemplate cmp_node_curve_rgb_in[] = {
-	{	SOCK_FLOAT, 1, N_("Fac"),	1.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_FACTOR},
-	{	SOCK_RGBA, 1, N_("Image"),	1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_RGBA, 1, N_("Black Level"),	0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 1, N_("White Level"),	1.0f, 1.0f, 1.0f, 1.0f},
-	{	-1, 0, ""	},
+    {SOCK_FLOAT, 1, N_("Fac"), 1.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_FACTOR},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {SOCK_RGBA, 1, N_("Black Level"), 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_RGBA, 1, N_("White Level"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {-1, 0, ""},
 };
 
 static bNodeSocketTemplate cmp_node_curve_rgb_out[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 static void node_composit_init_curve_rgb(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	node->storage = curvemapping_add(4, 0.0f, 0.0f, 1.0f, 1.0f);
+  node->storage = curvemapping_add(4, 0.0f, 0.0f, 1.0f, 1.0f);
 }
 
 void register_node_type_cmp_curve_rgb(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_CURVE_RGB, "RGB Curves", NODE_CLASS_OP_COLOR, 0);
-	node_type_socket_templates(&ntype, cmp_node_curve_rgb_in, cmp_node_curve_rgb_out);
-	node_type_size(&ntype, 200, 140, 320);
-	node_type_init(&ntype, node_composit_init_curve_rgb);
-	node_type_storage(&ntype, "CurveMapping", node_free_curves, node_copy_curves);
+  cmp_node_type_base(&ntype, CMP_NODE_CURVE_RGB, "RGB Curves", NODE_CLASS_OP_COLOR, 0);
+  node_type_socket_templates(&ntype, cmp_node_curve_rgb_in, cmp_node_curve_rgb_out);
+  node_type_size(&ntype, 200, 140, 320);
+  node_type_init(&ntype, node_composit_init_curve_rgb);
+  node_type_storage(&ntype, "CurveMapping", node_free_curves, node_copy_curves);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_defocus.c b/source/blender/nodes/composite/nodes/node_composite_defocus.c
index 96949657bcf..d5e64c56519 100644
--- a/source/blender/nodes/composite/nodes/node_composite_defocus.c
+++ b/source/blender/nodes/composite/nodes/node_composite_defocus.c
@@ -27,40 +27,40 @@
 
 /* ************ qdn: Defocus node ****************** */
 static bNodeSocketTemplate cmp_node_defocus_in[] = {
-	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_FLOAT, 1, N_("Z"),			1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {SOCK_FLOAT, 1, N_("Z"), 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate cmp_node_defocus_out[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 static void node_composit_init_defocus(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	/* qdn: defocus node */
-	NodeDefocus *nbd = MEM_callocN(sizeof(NodeDefocus), "node defocus data");
-	nbd->bktype = 0;
-	nbd->rotation = 0.0f;
-	nbd->preview = 1;
-	nbd->gamco = 0;
-	nbd->samples = 16;
-	nbd->fstop = 128.f;
-	nbd->maxblur = 16;
-	nbd->bthresh = 1.f;
-	nbd->scale = 1.f;
-	nbd->no_zbuf = 1;
-	node->storage = nbd;
+  /* qdn: defocus node */
+  NodeDefocus *nbd = MEM_callocN(sizeof(NodeDefocus), "node defocus data");
+  nbd->bktype = 0;
+  nbd->rotation = 0.0f;
+  nbd->preview = 1;
+  nbd->gamco = 0;
+  nbd->samples = 16;
+  nbd->fstop = 128.f;
+  nbd->maxblur = 16;
+  nbd->bthresh = 1.f;
+  nbd->scale = 1.f;
+  nbd->no_zbuf = 1;
+  node->storage = nbd;
 }
 
 void register_node_type_cmp_defocus(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_DEFOCUS, "Defocus", NODE_CLASS_OP_FILTER, 0);
-	node_type_socket_templates(&ntype, cmp_node_defocus_in, cmp_node_defocus_out);
-	node_type_init(&ntype, node_composit_init_defocus);
-	node_type_storage(&ntype, "NodeDefocus", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(&ntype, CMP_NODE_DEFOCUS, "Defocus", NODE_CLASS_OP_FILTER, 0);
+  node_type_socket_templates(&ntype, cmp_node_defocus_in, cmp_node_defocus_out);
+  node_type_init(&ntype, node_composit_init_defocus);
+  node_type_storage(&ntype, "NodeDefocus", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_despeckle.c b/source/blender/nodes/composite/nodes/node_composite_despeckle.c
index 4c5ab27b6cd..f57dd6b6766 100644
--- a/source/blender/nodes/composite/nodes/node_composite_despeckle.c
+++ b/source/blender/nodes/composite/nodes/node_composite_despeckle.c
@@ -25,28 +25,28 @@
 
 /* **************** FILTER  ******************** */
 static bNodeSocketTemplate cmp_node_despeckle_in[] = {
-	{	SOCK_FLOAT, 1, N_("Fac"),			1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
-	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
-	{	-1, 0, ""	},
+    {SOCK_FLOAT, 1, N_("Fac"), 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate cmp_node_despeckle_out[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 static void node_composit_init_despeckle(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	node->custom3 = 0.5f;
-	node->custom4 = 0.5f;
+  node->custom3 = 0.5f;
+  node->custom4 = 0.5f;
 }
 
 void register_node_type_cmp_despeckle(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_DESPECKLE, "Despeckle", NODE_CLASS_OP_FILTER, NODE_PREVIEW);
-	node_type_socket_templates(&ntype, cmp_node_despeckle_in, cmp_node_despeckle_out);
-	node_type_init(&ntype, node_composit_init_despeckle);
+  cmp_node_type_base(&ntype, CMP_NODE_DESPECKLE, "Despeckle", NODE_CLASS_OP_FILTER, NODE_PREVIEW);
+  node_type_socket_templates(&ntype, cmp_node_despeckle_in, cmp_node_despeckle_out);
+  node_type_init(&ntype, node_composit_init_despeckle);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_diffMatte.c b/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
index 6163d433349..20b5b009f72 100644
--- a/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
@@ -21,38 +21,38 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 /* ******************* channel Difference Matte ********************************* */
 static bNodeSocketTemplate cmp_node_diff_matte_in[] = {
-	{SOCK_RGBA, 1, N_("Image 1"), 1.0f, 1.0f, 1.0f, 1.0f},
-	{SOCK_RGBA, 1, N_("Image 2"), 1.0f, 1.0f, 1.0f, 1.0f},
-	{-1, 0, ""},
+    {SOCK_RGBA, 1, N_("Image 1"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {SOCK_RGBA, 1, N_("Image 2"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {-1, 0, ""},
 };
 
 static bNodeSocketTemplate cmp_node_diff_matte_out[] = {
-	{SOCK_RGBA, 0, N_("Image")},
-	{SOCK_FLOAT, 0, N_("Matte")},
-	{-1, 0, ""},
+    {SOCK_RGBA, 0, N_("Image")},
+    {SOCK_FLOAT, 0, N_("Matte")},
+    {-1, 0, ""},
 };
 
 static void node_composit_init_diff_matte(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeChroma *c = MEM_callocN(sizeof(NodeChroma), "node chroma");
-	node->storage = c;
-	c->t1 = 0.1f;
-	c->t2 = 0.1f;
+  NodeChroma *c = MEM_callocN(sizeof(NodeChroma), "node chroma");
+  node->storage = c;
+  c->t1 = 0.1f;
+  c->t2 = 0.1f;
 }
 
 void register_node_type_cmp_diff_matte(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_DIFF_MATTE, "Difference Key", NODE_CLASS_MATTE, NODE_PREVIEW);
-	node_type_socket_templates(&ntype, cmp_node_diff_matte_in, cmp_node_diff_matte_out);
-	node_type_init(&ntype, node_composit_init_diff_matte);
-	node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(
+      &ntype, CMP_NODE_DIFF_MATTE, "Difference Key", NODE_CLASS_MATTE, NODE_PREVIEW);
+  node_type_socket_templates(&ntype, cmp_node_diff_matte_in, cmp_node_diff_matte_out);
+  node_type_init(&ntype, node_composit_init_diff_matte);
+  node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_dilate.c b/source/blender/nodes/composite/nodes/node_composite_dilate.c
index e0ccfb6ec10..f46df1d7d78 100644
--- a/source/blender/nodes/composite/nodes/node_composite_dilate.c
+++ b/source/blender/nodes/composite/nodes/node_composite_dilate.c
@@ -21,36 +21,30 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
-
 /* **************** Dilate/Erode ******************** */
 
 static bNodeSocketTemplate cmp_node_dilateerode_in[] = {
-	{   SOCK_FLOAT, 1, N_("Mask"),      0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{   -1, 0, ""   }
-};
-static bNodeSocketTemplate cmp_node_dilateerode_out[] = {
-	{   SOCK_FLOAT, 0, N_("Mask")},
-	{   -1, 0, ""   }
-};
+    {SOCK_FLOAT, 1, N_("Mask"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE}, {-1, 0, ""}};
+static bNodeSocketTemplate cmp_node_dilateerode_out[] = {{SOCK_FLOAT, 0, N_("Mask")}, {-1, 0, ""}};
 
 static void node_composit_init_dilateerode(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeDilateErode *data = MEM_callocN(sizeof(NodeDilateErode), "NodeDilateErode");
-	data->falloff = PROP_SMOOTH;
-	node->storage = data;
+  NodeDilateErode *data = MEM_callocN(sizeof(NodeDilateErode), "NodeDilateErode");
+  data->falloff = PROP_SMOOTH;
+  node->storage = data;
 }
 
 void register_node_type_cmp_dilateerode(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_DILATEERODE, "Dilate/Erode", NODE_CLASS_OP_FILTER, 0);
-	node_type_socket_templates(&ntype, cmp_node_dilateerode_in, cmp_node_dilateerode_out);
-	node_type_init(&ntype, node_composit_init_dilateerode);
-	node_type_storage(&ntype, "NodeDilateErode", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(&ntype, CMP_NODE_DILATEERODE, "Dilate/Erode", NODE_CLASS_OP_FILTER, 0);
+  node_type_socket_templates(&ntype, cmp_node_dilateerode_in, cmp_node_dilateerode_out);
+  node_type_init(&ntype, node_composit_init_dilateerode);
+  node_type_storage(
+      &ntype, "NodeDilateErode", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_directionalblur.c b/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
index b0996d76cc1..b0f610cb942 100644
--- a/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
+++ b/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
@@ -21,36 +21,31 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 static bNodeSocketTemplate cmp_node_dblur_in[] = {
-	{   SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.f},
-	{   -1, 0, ""       }
-};
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.f}, {-1, 0, ""}};
 
-static bNodeSocketTemplate cmp_node_dblur_out[] = {
-	{   SOCK_RGBA, 0, N_("Image")},
-	{   -1, 0, ""       }
-};
+static bNodeSocketTemplate cmp_node_dblur_out[] = {{SOCK_RGBA, 0, N_("Image")}, {-1, 0, ""}};
 
 static void node_composit_init_dblur(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeDBlurData *ndbd = MEM_callocN(sizeof(NodeDBlurData), "node dblur data");
-	node->storage = ndbd;
-	ndbd->iter = 1;
-	ndbd->center_x = 0.5;
-	ndbd->center_y = 0.5;
+  NodeDBlurData *ndbd = MEM_callocN(sizeof(NodeDBlurData), "node dblur data");
+  node->storage = ndbd;
+  ndbd->iter = 1;
+  ndbd->center_x = 0.5;
+  ndbd->center_y = 0.5;
 }
 
 void register_node_type_cmp_dblur(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_DBLUR, "Directional Blur", NODE_CLASS_OP_FILTER, 0);
-	node_type_socket_templates(&ntype, cmp_node_dblur_in, cmp_node_dblur_out);
-	node_type_init(&ntype, node_composit_init_dblur);
-	node_type_storage(&ntype, "NodeDBlurData", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(&ntype, CMP_NODE_DBLUR, "Directional Blur", NODE_CLASS_OP_FILTER, 0);
+  node_type_socket_templates(&ntype, cmp_node_dblur_in, cmp_node_dblur_out);
+  node_type_init(&ntype, node_composit_init_dblur);
+  node_type_storage(
+      &ntype, "NodeDBlurData", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_displace.c b/source/blender/nodes/composite/nodes/node_composite_displace.c
index 6eb93632e43..939d9feba5e 100644
--- a/source/blender/nodes/composite/nodes/node_composite_displace.c
+++ b/source/blender/nodes/composite/nodes/node_composite_displace.c
@@ -21,30 +21,28 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
-
 /* **************** Displace  ******************** */
 
 static bNodeSocketTemplate cmp_node_displace_in[] = {
-	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_VECTOR, 1, N_("Vector"),			1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_TRANSLATION},
-	{	SOCK_FLOAT, 1, N_("X Scale"),				0.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, N_("Y Scale"),				0.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f, PROP_NONE},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {SOCK_VECTOR, 1, N_("Vector"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_TRANSLATION},
+    {SOCK_FLOAT, 1, N_("X Scale"), 0.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f, PROP_NONE},
+    {SOCK_FLOAT, 1, N_("Y Scale"), 0.0f, 0.0f, 0.0f, 0.0f, -1000.0f, 1000.0f, PROP_NONE},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate cmp_node_displace_out[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 void register_node_type_cmp_displace(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_DISPLACE, "Displace", NODE_CLASS_DISTORT, 0);
-	node_type_socket_templates(&ntype, cmp_node_displace_in, cmp_node_displace_out);
+  cmp_node_type_base(&ntype, CMP_NODE_DISPLACE, "Displace", NODE_CLASS_DISTORT, 0);
+  node_type_socket_templates(&ntype, cmp_node_displace_in, cmp_node_displace_out);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c b/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
index 8c149076fa8..a14ec9ccf35 100644
--- a/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
@@ -21,39 +21,38 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 /* ******************* channel Distance Matte ********************************* */
 static bNodeSocketTemplate cmp_node_distance_matte_in[] = {
-	{SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
-	{SOCK_RGBA, 1, N_("Key Color"), 1.0f, 1.0f, 1.0f, 1.0f},
-	{-1, 0, ""},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {SOCK_RGBA, 1, N_("Key Color"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {-1, 0, ""},
 };
 
 static bNodeSocketTemplate cmp_node_distance_matte_out[] = {
-	{SOCK_RGBA, 0, N_("Image")},
-	{SOCK_FLOAT, 0, N_("Matte")},
-	{-1, 0, ""},
+    {SOCK_RGBA, 0, N_("Image")},
+    {SOCK_FLOAT, 0, N_("Matte")},
+    {-1, 0, ""},
 };
 
 static void node_composit_init_distance_matte(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeChroma *c = MEM_callocN(sizeof(NodeChroma), "node chroma");
-	node->storage = c;
-	c->channel = 1;
-	c->t1 = 0.1f;
-	c->t2 = 0.1f;
+  NodeChroma *c = MEM_callocN(sizeof(NodeChroma), "node chroma");
+  node->storage = c;
+  c->channel = 1;
+  c->t1 = 0.1f;
+  c->t2 = 0.1f;
 }
 
 void register_node_type_cmp_distance_matte(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_DIST_MATTE, "Distance Key", NODE_CLASS_MATTE, NODE_PREVIEW);
-	node_type_socket_templates(&ntype, cmp_node_distance_matte_in, cmp_node_distance_matte_out);
-	node_type_init(&ntype, node_composit_init_distance_matte);
-	node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(&ntype, CMP_NODE_DIST_MATTE, "Distance Key", NODE_CLASS_MATTE, NODE_PREVIEW);
+  node_type_socket_templates(&ntype, cmp_node_distance_matte_in, cmp_node_distance_matte_out);
+  node_type_init(&ntype, node_composit_init_distance_matte);
+  node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c b/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
index 04effdc152e..e4a82a35890 100644
--- a/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
+++ b/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
@@ -23,24 +23,41 @@
 #include "node_composite_util.h"
 /* **************** Double Edge Mask ******************** */
 
-
 static bNodeSocketTemplate cmp_node_doubleedgemask_in[] = {
-	{ SOCK_FLOAT, 1, "Inner Mask", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f, PROP_NONE},	// inner mask socket definition
-	{ SOCK_FLOAT, 1, "Outer Mask", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f, PROP_NONE},	// outer mask socket definition
-	{ -1, 0, ""	},																	// input socket array terminator
+    {SOCK_FLOAT,
+     1,
+     "Inner Mask",
+     0.8f,
+     0.8f,
+     0.8f,
+     1.0f,
+     0.0f,
+     1.0f,
+     PROP_NONE},  // inner mask socket definition
+    {SOCK_FLOAT,
+     1,
+     "Outer Mask",
+     0.8f,
+     0.8f,
+     0.8f,
+     1.0f,
+     0.0f,
+     1.0f,
+     PROP_NONE},  // outer mask socket definition
+    {-1, 0, ""},  // input socket array terminator
 };
 static bNodeSocketTemplate cmp_node_doubleedgemask_out[] = {
-	{ SOCK_FLOAT, 0, "Mask"},		// output socket definition
-	{ -1, 0, "" },					// output socket array terminator
+    {SOCK_FLOAT, 0, "Mask"},  // output socket definition
+    {-1, 0, ""},              // output socket array terminator
 };
 
 void register_node_type_cmp_doubleedgemask(void)
 {
-	static bNodeType ntype;	// allocate a node type data structure
+  static bNodeType ntype;  // allocate a node type data structure
 
-	cmp_node_type_base(&ntype, CMP_NODE_DOUBLEEDGEMASK, "Double Edge Mask", NODE_CLASS_MATTE, 0);
-	node_type_socket_templates(&ntype, cmp_node_doubleedgemask_in, cmp_node_doubleedgemask_out);
-	node_type_socket_templates(&ntype, cmp_node_doubleedgemask_in, cmp_node_doubleedgemask_out);
+  cmp_node_type_base(&ntype, CMP_NODE_DOUBLEEDGEMASK, "Double Edge Mask", NODE_CLASS_MATTE, 0);
+  node_type_socket_templates(&ntype, cmp_node_doubleedgemask_in, cmp_node_doubleedgemask_out);
+  node_type_socket_templates(&ntype, cmp_node_doubleedgemask_in, cmp_node_doubleedgemask_out);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c b/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
index ccebe3a1e1e..69795cdee77 100644
--- a/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
+++ b/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
@@ -21,41 +21,38 @@
  * \ingroup cmpnodes
  */
 
-
 #include "../node_composite_util.h"
 
 /* **************** SCALAR MATH ******************** */
 static bNodeSocketTemplate cmp_node_ellipsemask_in[] = {
-	{	SOCK_FLOAT, 1, N_("Mask"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 1, N_("Value"), 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
-	{   -1, 0, "" }
-};
+    {SOCK_FLOAT, 1, N_("Mask"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
+    {SOCK_FLOAT, 1, N_("Value"), 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
+    {-1, 0, ""}};
 
 static bNodeSocketTemplate cmp_node_ellipsemask_out[] = {
-	{	SOCK_FLOAT, 0, N_("Mask"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
-	{   -1, 0, "" }
-};
+    {SOCK_FLOAT, 0, N_("Mask"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f}, {-1, 0, ""}};
 
 static void node_composit_init_ellipsemask(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeEllipseMask *data = MEM_callocN(sizeof(NodeEllipseMask), "NodeEllipseMask");
-	data->x = 0.5;
-	data->y = 0.5;
-	data->width = 0.2;
-	data->height = 0.1;
-	data->rotation = 0.0;
-	node->storage = data;
+  NodeEllipseMask *data = MEM_callocN(sizeof(NodeEllipseMask), "NodeEllipseMask");
+  data->x = 0.5;
+  data->y = 0.5;
+  data->width = 0.2;
+  data->height = 0.1;
+  data->rotation = 0.0;
+  node->storage = data;
 }
 
 void register_node_type_cmp_ellipsemask(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_MASK_ELLIPSE, "Ellipse Mask", NODE_CLASS_MATTE, 0);
-	node_type_socket_templates(&ntype, cmp_node_ellipsemask_in, cmp_node_ellipsemask_out);
-	node_type_size(&ntype, 260, 110, 320);
-	node_type_init(&ntype, node_composit_init_ellipsemask);
-	node_type_storage(&ntype, "NodeEllipseMask", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(&ntype, CMP_NODE_MASK_ELLIPSE, "Ellipse Mask", NODE_CLASS_MATTE, 0);
+  node_type_socket_templates(&ntype, cmp_node_ellipsemask_in, cmp_node_ellipsemask_out);
+  node_type_size(&ntype, 260, 110, 320);
+  node_type_init(&ntype, node_composit_init_ellipsemask);
+  node_type_storage(
+      &ntype, "NodeEllipseMask", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_filter.c b/source/blender/nodes/composite/nodes/node_composite_filter.c
index a685116839d..0362fd51d78 100644
--- a/source/blender/nodes/composite/nodes/node_composite_filter.c
+++ b/source/blender/nodes/composite/nodes/node_composite_filter.c
@@ -21,27 +21,26 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 /* **************** FILTER  ******************** */
 static bNodeSocketTemplate cmp_node_filter_in[] = {
-	{	SOCK_FLOAT, 1, N_("Fac"),			1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
-	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
-	{	-1, 0, ""	},
+    {SOCK_FLOAT, 1, N_("Fac"), 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate cmp_node_filter_out[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 void register_node_type_cmp_filter(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_FILTER, "Filter", NODE_CLASS_OP_FILTER, NODE_PREVIEW);
-	node_type_socket_templates(&ntype, cmp_node_filter_in, cmp_node_filter_out);
-	node_type_label(&ntype, node_filter_label);
+  cmp_node_type_base(&ntype, CMP_NODE_FILTER, "Filter", NODE_CLASS_OP_FILTER, NODE_PREVIEW);
+  node_type_socket_templates(&ntype, cmp_node_filter_in, cmp_node_filter_out);
+  node_type_label(&ntype, node_filter_label);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_flip.c b/source/blender/nodes/composite/nodes/node_composite_flip.c
index 06485ae58ee..668922426f6 100644
--- a/source/blender/nodes/composite/nodes/node_composite_flip.c
+++ b/source/blender/nodes/composite/nodes/node_composite_flip.c
@@ -21,26 +21,25 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 /* **************** Flip  ******************** */
 static bNodeSocketTemplate cmp_node_flip_in[] = {
-	{	SOCK_RGBA, 1, N_("Image"),		    1.0f, 1.0f, 1.0f, 1.0f},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {-1, 0, ""},
 };
 
 static bNodeSocketTemplate cmp_node_flip_out[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 void register_node_type_cmp_flip(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_FLIP, "Flip", NODE_CLASS_DISTORT, 0);
-	node_type_socket_templates(&ntype, cmp_node_flip_in, cmp_node_flip_out);
+  cmp_node_type_base(&ntype, CMP_NODE_FLIP, "Flip", NODE_CLASS_DISTORT, 0);
+  node_type_socket_templates(&ntype, cmp_node_flip_in, cmp_node_flip_out);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_gamma.c b/source/blender/nodes/composite/nodes/node_composite_gamma.c
index a912387660a..bf624d423d8 100644
--- a/source/blender/nodes/composite/nodes/node_composite_gamma.c
+++ b/source/blender/nodes/composite/nodes/node_composite_gamma.c
@@ -21,27 +21,26 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 /* **************** Gamma Tools  ******************** */
 
 static bNodeSocketTemplate cmp_node_gamma_in[] = {
-	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_FLOAT, 1, N_("Gamma"),			1.0f, 0.0f, 0.0f, 0.0f, 0.001f, 10.0f, PROP_UNSIGNED},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {SOCK_FLOAT, 1, N_("Gamma"), 1.0f, 0.0f, 0.0f, 0.0f, 0.001f, 10.0f, PROP_UNSIGNED},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate cmp_node_gamma_out[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 void register_node_type_cmp_gamma(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_GAMMA, "Gamma", NODE_CLASS_OP_COLOR, 0);
-	node_type_socket_templates(&ntype, cmp_node_gamma_in, cmp_node_gamma_out);
+  cmp_node_type_base(&ntype, CMP_NODE_GAMMA, "Gamma", NODE_CLASS_OP_COLOR, 0);
+  node_type_socket_templates(&ntype, cmp_node_gamma_in, cmp_node_gamma_out);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_glare.c b/source/blender/nodes/composite/nodes/node_composite_glare.c
index f28c80c9367..42b3d5e08de 100644
--- a/source/blender/nodes/composite/nodes/node_composite_glare.c
+++ b/source/blender/nodes/composite/nodes/node_composite_glare.c
@@ -21,43 +21,42 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 static bNodeSocketTemplate cmp_node_glare_in[] = {
-	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate cmp_node_glare_out[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 static void node_composit_init_glare(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeGlare *ndg = MEM_callocN(sizeof(NodeGlare), "node glare data");
-	ndg->quality = 1;
-	ndg->type = 2;
-	ndg->iter = 3;
-	ndg->colmod = 0.25;
-	ndg->mix = 0;
-	ndg->threshold = 1;
-	ndg->star_45 = true;
-	ndg->streaks = 4;
-	ndg->angle_ofs = 0.0f;
-	ndg->fade = 0.9;
-	ndg->size = 8;
-	node->storage = ndg;
+  NodeGlare *ndg = MEM_callocN(sizeof(NodeGlare), "node glare data");
+  ndg->quality = 1;
+  ndg->type = 2;
+  ndg->iter = 3;
+  ndg->colmod = 0.25;
+  ndg->mix = 0;
+  ndg->threshold = 1;
+  ndg->star_45 = true;
+  ndg->streaks = 4;
+  ndg->angle_ofs = 0.0f;
+  ndg->fade = 0.9;
+  ndg->size = 8;
+  node->storage = ndg;
 }
 
 void register_node_type_cmp_glare(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_GLARE, "Glare", NODE_CLASS_OP_FILTER, 0);
-	node_type_socket_templates(&ntype, cmp_node_glare_in, cmp_node_glare_out);
-	node_type_init(&ntype, node_composit_init_glare);
-	node_type_storage(&ntype, "NodeGlare", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(&ntype, CMP_NODE_GLARE, "Glare", NODE_CLASS_OP_FILTER, 0);
+  node_type_socket_templates(&ntype, cmp_node_glare_in, cmp_node_glare_out);
+  node_type_init(&ntype, node_composit_init_glare);
+  node_type_storage(&ntype, "NodeGlare", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c b/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
index f02dba62114..647b6d3feb5 100644
--- a/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
+++ b/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
@@ -21,30 +21,28 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
-
 /* **************** Hue Saturation ******************** */
 static bNodeSocketTemplate cmp_node_hue_sat_in[] = {
-	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_FLOAT, 1, N_("Hue"),			0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
-	{	SOCK_FLOAT, 1, N_("Saturation"),		1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 2.0f, PROP_FACTOR},
-	{	SOCK_FLOAT, 1, N_("Value"),			1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 2.0f, PROP_FACTOR},
-	{	SOCK_FLOAT, 1, N_("Fac"),			1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {SOCK_FLOAT, 1, N_("Hue"), 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
+    {SOCK_FLOAT, 1, N_("Saturation"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 2.0f, PROP_FACTOR},
+    {SOCK_FLOAT, 1, N_("Value"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 2.0f, PROP_FACTOR},
+    {SOCK_FLOAT, 1, N_("Fac"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate cmp_node_hue_sat_out[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 void register_node_type_cmp_hue_sat(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_HUE_SAT, "Hue Saturation Value", NODE_CLASS_OP_COLOR, 0);
-	node_type_socket_templates(&ntype, cmp_node_hue_sat_in, cmp_node_hue_sat_out);
+  cmp_node_type_base(&ntype, CMP_NODE_HUE_SAT, "Hue Saturation Value", NODE_CLASS_OP_COLOR, 0);
+  node_type_socket_templates(&ntype, cmp_node_hue_sat_in, cmp_node_hue_sat_out);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_huecorrect.c b/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
index 6b16f8df8bd..7fcaae0bd9c 100644
--- a/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
+++ b/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
@@ -21,45 +21,44 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 static bNodeSocketTemplate cmp_node_huecorrect_in[] = {
-	{	SOCK_FLOAT, 1, N_("Fac"),	1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
-	{	SOCK_RGBA, 1, N_("Image"),	1.0f, 1.0f, 1.0f, 1.0f},
-	{	-1, 0, ""	},
+    {SOCK_FLOAT, 1, N_("Fac"), 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {-1, 0, ""},
 };
 
 static bNodeSocketTemplate cmp_node_huecorrect_out[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 static void node_composit_init_huecorrect(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	CurveMapping *cumapping = node->storage = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
-	int c;
+  CurveMapping *cumapping = node->storage = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
+  int c;
 
-	cumapping->preset = CURVE_PRESET_MID9;
+  cumapping->preset = CURVE_PRESET_MID9;
 
-	for (c = 0; c < 3; c++) {
-		CurveMap *cuma = &cumapping->cm[c];
-		curvemap_reset(cuma, &cumapping->clipr, cumapping->preset, CURVEMAP_SLOPE_POSITIVE);
-	}
+  for (c = 0; c < 3; c++) {
+    CurveMap *cuma = &cumapping->cm[c];
+    curvemap_reset(cuma, &cumapping->clipr, cumapping->preset, CURVEMAP_SLOPE_POSITIVE);
+  }
 
-	/* default to showing Saturation */
-	cumapping->cur = 1;
+  /* default to showing Saturation */
+  cumapping->cur = 1;
 }
 
 void register_node_type_cmp_huecorrect(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_HUECORRECT, "Hue Correct", NODE_CLASS_OP_COLOR, 0);
-	node_type_socket_templates(&ntype, cmp_node_huecorrect_in, cmp_node_huecorrect_out);
-	node_type_size(&ntype, 320, 140, 500);
-	node_type_init(&ntype, node_composit_init_huecorrect);
-	node_type_storage(&ntype, "CurveMapping", node_free_curves, node_copy_curves);
+  cmp_node_type_base(&ntype, CMP_NODE_HUECORRECT, "Hue Correct", NODE_CLASS_OP_COLOR, 0);
+  node_type_socket_templates(&ntype, cmp_node_huecorrect_in, cmp_node_huecorrect_out);
+  node_type_size(&ntype, 320, 140, 500);
+  node_type_init(&ntype, node_composit_init_huecorrect);
+  node_type_storage(&ntype, "CurveMapping", node_free_curves, node_copy_curves);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_idMask.c b/source/blender/nodes/composite/nodes/node_composite_idMask.c
index 6db70413539..d15b587a2cb 100644
--- a/source/blender/nodes/composite/nodes/node_composite_idMask.c
+++ b/source/blender/nodes/composite/nodes/node_composite_idMask.c
@@ -21,27 +21,25 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
-
 /* **************** ID Mask  ******************** */
 
 static bNodeSocketTemplate cmp_node_idmask_in[] = {
-	{	SOCK_FLOAT, 1, N_("ID value"),			1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	-1, 0, ""	},
+    {SOCK_FLOAT, 1, N_("ID value"), 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate cmp_node_idmask_out[] = {
-	{	SOCK_FLOAT, 0, N_("Alpha")},
-	{	-1, 0, ""	},
+    {SOCK_FLOAT, 0, N_("Alpha")},
+    {-1, 0, ""},
 };
 
 void register_node_type_cmp_idmask(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_ID_MASK, "ID Mask", NODE_CLASS_CONVERTOR, 0);
-	node_type_socket_templates(&ntype, cmp_node_idmask_in, cmp_node_idmask_out);
+  cmp_node_type_base(&ntype, CMP_NODE_ID_MASK, "ID Mask", NODE_CLASS_CONVERTOR, 0);
+  node_type_socket_templates(&ntype, cmp_node_idmask_in, cmp_node_idmask_out);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_image.c b/source/blender/nodes/composite/nodes/node_composite_image.c
index 37652daa312..d4278b3b540 100644
--- a/source/blender/nodes/composite/nodes/node_composite_image.c
+++ b/source/blender/nodes/composite/nodes/node_composite_image.c
@@ -38,429 +38,540 @@
 /* **************** IMAGE (and RenderResult, multilayer image) ******************** */
 
 static bNodeSocketTemplate cmp_node_rlayers_out[] = {
-	{	SOCK_RGBA,   0, N_("Image"),							0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT,  0, N_("Alpha"),							1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT,  0, N_(RE_PASSNAME_Z),						1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_VECTOR, 0, N_(RE_PASSNAME_NORMAL),					0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_VECTOR, 0, N_(RE_PASSNAME_UV),						1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_VECTOR, 0, N_(RE_PASSNAME_VECTOR),					1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA,   0, N_(RE_PASSNAME_DEPRECATED),				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA,   0, N_(RE_PASSNAME_DEPRECATED),				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA,   0, N_(RE_PASSNAME_DEPRECATED),				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA,   0, N_(RE_PASSNAME_SHADOW),					0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA,   0, N_(RE_PASSNAME_AO),						0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA,   0, N_(RE_PASSNAME_DEPRECATED),				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA,   0, N_(RE_PASSNAME_DEPRECATED),				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA,   0, N_(RE_PASSNAME_DEPRECATED),				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT,  0, N_(RE_PASSNAME_INDEXOB),				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT,  0, N_(RE_PASSNAME_INDEXMA),				0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT,  0, N_(RE_PASSNAME_MIST),					0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA,   0, N_(RE_PASSNAME_EMIT),					0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA,   0, N_(RE_PASSNAME_ENVIRONMENT),			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA,   0, N_(RE_PASSNAME_DIFFUSE_DIRECT),			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA,   0, N_(RE_PASSNAME_DIFFUSE_INDIRECT),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA,   0, N_(RE_PASSNAME_DIFFUSE_COLOR),			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA,   0, N_(RE_PASSNAME_GLOSSY_DIRECT),			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA,   0, N_(RE_PASSNAME_GLOSSY_INDIRECT),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA,   0, N_(RE_PASSNAME_GLOSSY_COLOR),			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA,   0, N_(RE_PASSNAME_TRANSM_DIRECT),			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA,   0, N_(RE_PASSNAME_TRANSM_INDIRECT),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA,   0, N_(RE_PASSNAME_TRANSM_COLOR),			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA,   0, N_(RE_PASSNAME_SUBSURFACE_DIRECT),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA,   0, N_(RE_PASSNAME_SUBSURFACE_INDIRECT),	0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA,   0, N_(RE_PASSNAME_SUBSURFACE_COLOR),		0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_FLOAT, 0, N_("Alpha"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_FLOAT, 0, N_(RE_PASSNAME_Z), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_VECTOR, 0, N_(RE_PASSNAME_NORMAL), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_VECTOR, 0, N_(RE_PASSNAME_UV), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_VECTOR, 0, N_(RE_PASSNAME_VECTOR), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_RGBA, 0, N_(RE_PASSNAME_DEPRECATED), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_RGBA, 0, N_(RE_PASSNAME_DEPRECATED), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_RGBA, 0, N_(RE_PASSNAME_DEPRECATED), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_RGBA, 0, N_(RE_PASSNAME_SHADOW), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_RGBA, 0, N_(RE_PASSNAME_AO), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_RGBA, 0, N_(RE_PASSNAME_DEPRECATED), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_RGBA, 0, N_(RE_PASSNAME_DEPRECATED), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_RGBA, 0, N_(RE_PASSNAME_DEPRECATED), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_FLOAT, 0, N_(RE_PASSNAME_INDEXOB), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_FLOAT, 0, N_(RE_PASSNAME_INDEXMA), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_FLOAT, 0, N_(RE_PASSNAME_MIST), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_RGBA, 0, N_(RE_PASSNAME_EMIT), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_RGBA, 0, N_(RE_PASSNAME_ENVIRONMENT), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_RGBA, 0, N_(RE_PASSNAME_DIFFUSE_DIRECT), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_RGBA, 0, N_(RE_PASSNAME_DIFFUSE_INDIRECT), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_RGBA, 0, N_(RE_PASSNAME_DIFFUSE_COLOR), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_RGBA, 0, N_(RE_PASSNAME_GLOSSY_DIRECT), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_RGBA, 0, N_(RE_PASSNAME_GLOSSY_INDIRECT), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_RGBA, 0, N_(RE_PASSNAME_GLOSSY_COLOR), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_RGBA, 0, N_(RE_PASSNAME_TRANSM_DIRECT), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_RGBA, 0, N_(RE_PASSNAME_TRANSM_INDIRECT), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_RGBA, 0, N_(RE_PASSNAME_TRANSM_COLOR), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_RGBA, 0, N_(RE_PASSNAME_SUBSURFACE_DIRECT), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_RGBA, 0, N_(RE_PASSNAME_SUBSURFACE_INDIRECT), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_RGBA, 0, N_(RE_PASSNAME_SUBSURFACE_COLOR), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    {-1, 0, ""},
 };
 
-static void cmp_node_image_add_pass_output(bNodeTree *ntree, bNode *node,
-                                           const char *name, const char *passname,
-                                           int rres_index, int type, int is_rlayers,
-                                           LinkNodePair *available_sockets, int *prev_index)
+static void cmp_node_image_add_pass_output(bNodeTree *ntree,
+                                           bNode *node,
+                                           const char *name,
+                                           const char *passname,
+                                           int rres_index,
+                                           int type,
+                                           int is_rlayers,
+                                           LinkNodePair *available_sockets,
+                                           int *prev_index)
 {
-	bNodeSocket *sock;
-	int sock_index = BLI_findstringindex(&node->outputs, name, offsetof(bNodeSocket, name));
-
-	if (sock_index < 0) {
-		/* The first 31 sockets always are the legacy hardcoded sockets.
-		 * Any dynamically allocated sockets follow afterwards, and are sorted in the order in which they were stored in the RenderResult.
-		 * Therefore, we remember the index of the last matched socket. New sockets are placed behind the previously traversed one, but always after the first 31. */
-		int after_index = *prev_index;
-		if (is_rlayers && after_index < 30)
-			after_index = 30;
-
-		if (rres_index >= 0) {
-			sock = node_add_socket_from_template(ntree, node, &cmp_node_rlayers_out[rres_index], SOCK_OUT);
-		}
-		else {
-			sock = nodeAddStaticSocket(ntree, node, SOCK_OUT, type, PROP_NONE, name, name);
-		}
-		/* extra socket info */
-		NodeImageLayer *sockdata = MEM_callocN(sizeof(NodeImageLayer), "node image layer");
-		sock->storage = sockdata;
-
-		BLI_strncpy(sockdata->pass_name, passname, sizeof(sockdata->pass_name));
-
-		sock_index = BLI_listbase_count(&node->outputs) - 1;
-		if (sock_index != after_index + 1) {
-			bNodeSocket *after_sock = BLI_findlink(&node->outputs, after_index);
-			BLI_remlink(&node->outputs, sock);
-			BLI_insertlinkafter(&node->outputs, after_sock, sock);
-		}
-	}
-	else {
-		sock = BLI_findlink(&node->outputs, sock_index);
-		NodeImageLayer *sockdata = sock->storage;
-		if (sockdata) {
-			BLI_strncpy(sockdata->pass_name, passname, sizeof(sockdata->pass_name));
-		}
-	}
-
-	BLI_linklist_append(available_sockets, sock);
-	*prev_index = sock_index;
+  bNodeSocket *sock;
+  int sock_index = BLI_findstringindex(&node->outputs, name, offsetof(bNodeSocket, name));
+
+  if (sock_index < 0) {
+    /* The first 31 sockets always are the legacy hardcoded sockets.
+     * Any dynamically allocated sockets follow afterwards, and are sorted in the order in which they were stored in the RenderResult.
+     * Therefore, we remember the index of the last matched socket. New sockets are placed behind the previously traversed one, but always after the first 31. */
+    int after_index = *prev_index;
+    if (is_rlayers && after_index < 30)
+      after_index = 30;
+
+    if (rres_index >= 0) {
+      sock = node_add_socket_from_template(
+          ntree, node, &cmp_node_rlayers_out[rres_index], SOCK_OUT);
+    }
+    else {
+      sock = nodeAddStaticSocket(ntree, node, SOCK_OUT, type, PROP_NONE, name, name);
+    }
+    /* extra socket info */
+    NodeImageLayer *sockdata = MEM_callocN(sizeof(NodeImageLayer), "node image layer");
+    sock->storage = sockdata;
+
+    BLI_strncpy(sockdata->pass_name, passname, sizeof(sockdata->pass_name));
+
+    sock_index = BLI_listbase_count(&node->outputs) - 1;
+    if (sock_index != after_index + 1) {
+      bNodeSocket *after_sock = BLI_findlink(&node->outputs, after_index);
+      BLI_remlink(&node->outputs, sock);
+      BLI_insertlinkafter(&node->outputs, after_sock, sock);
+    }
+  }
+  else {
+    sock = BLI_findlink(&node->outputs, sock_index);
+    NodeImageLayer *sockdata = sock->storage;
+    if (sockdata) {
+      BLI_strncpy(sockdata->pass_name, passname, sizeof(sockdata->pass_name));
+    }
+  }
+
+  BLI_linklist_append(available_sockets, sock);
+  *prev_index = sock_index;
 }
 
-static void cmp_node_image_create_outputs(bNodeTree *ntree, bNode *node, LinkNodePair *available_sockets)
+static void cmp_node_image_create_outputs(bNodeTree *ntree,
+                                          bNode *node,
+                                          LinkNodePair *available_sockets)
 {
-	Image *ima = (Image *)node->id;
-	ImBuf *ibuf;
-	int prev_index = -1;
-	if (ima) {
-		ImageUser *iuser = node->storage;
-		ImageUser load_iuser = {NULL};
-		int offset = BKE_image_sequence_guess_offset(ima);
-
-		/* It is possible that image user in this node is not
-		 * properly updated yet. In this case loading image will
-		 * fail and sockets detection will go wrong.
-		 *
-		 * So we manually construct image user to be sure first
-		 * image from sequence (that one which is set as filename
-		 * for image datablock) is used for sockets detection
-		 */
-		load_iuser.ok = 1;
-		load_iuser.framenr = offset;
-
-		/* make sure ima->type is correct */
-		ibuf = BKE_image_acquire_ibuf(ima, &load_iuser, NULL);
-
-		if (ima->rr) {
-			RenderLayer *rl = BLI_findlink(&ima->rr->layers, iuser->layer);
-
-			if (rl) {
-				RenderPass *rpass;
-				for (rpass = rl->passes.first; rpass; rpass = rpass->next) {
-					int type;
-					if (rpass->channels == 1)
-						type = SOCK_FLOAT;
-					else
-						type = SOCK_RGBA;
-
-					cmp_node_image_add_pass_output(ntree, node, rpass->name, rpass->name, -1, type, false, available_sockets, &prev_index);
-					/* Special handling for the Combined pass to ensure compatibility. */
-					if (STREQ(rpass->name, RE_PASSNAME_COMBINED)) {
-						cmp_node_image_add_pass_output(ntree, node, "Alpha", rpass->name, -1, SOCK_FLOAT, false, available_sockets, &prev_index);
-					}
-				}
-				BKE_image_release_ibuf(ima, ibuf, NULL);
-				return;
-			}
-		}
-	}
-
-	cmp_node_image_add_pass_output(ntree, node, "Image", RE_PASSNAME_COMBINED, -1, SOCK_RGBA, false, available_sockets, &prev_index);
-	cmp_node_image_add_pass_output(ntree, node, "Alpha", RE_PASSNAME_COMBINED, -1, SOCK_FLOAT, false, available_sockets, &prev_index);
-
-	if (ima) {
-		if (!ima->rr) {
-			cmp_node_image_add_pass_output(ntree, node, RE_PASSNAME_Z, RE_PASSNAME_Z, -1, SOCK_FLOAT, false, available_sockets, &prev_index);
-		}
-		BKE_image_release_ibuf(ima, ibuf, NULL);
-	}
+  Image *ima = (Image *)node->id;
+  ImBuf *ibuf;
+  int prev_index = -1;
+  if (ima) {
+    ImageUser *iuser = node->storage;
+    ImageUser load_iuser = {NULL};
+    int offset = BKE_image_sequence_guess_offset(ima);
+
+    /* It is possible that image user in this node is not
+     * properly updated yet. In this case loading image will
+     * fail and sockets detection will go wrong.
+     *
+     * So we manually construct image user to be sure first
+     * image from sequence (that one which is set as filename
+     * for image datablock) is used for sockets detection
+     */
+    load_iuser.ok = 1;
+    load_iuser.framenr = offset;
+
+    /* make sure ima->type is correct */
+    ibuf = BKE_image_acquire_ibuf(ima, &load_iuser, NULL);
+
+    if (ima->rr) {
+      RenderLayer *rl = BLI_findlink(&ima->rr->layers, iuser->layer);
+
+      if (rl) {
+        RenderPass *rpass;
+        for (rpass = rl->passes.first; rpass; rpass = rpass->next) {
+          int type;
+          if (rpass->channels == 1)
+            type = SOCK_FLOAT;
+          else
+            type = SOCK_RGBA;
+
+          cmp_node_image_add_pass_output(ntree,
+                                         node,
+                                         rpass->name,
+                                         rpass->name,
+                                         -1,
+                                         type,
+                                         false,
+                                         available_sockets,
+                                         &prev_index);
+          /* Special handling for the Combined pass to ensure compatibility. */
+          if (STREQ(rpass->name, RE_PASSNAME_COMBINED)) {
+            cmp_node_image_add_pass_output(ntree,
+                                           node,
+                                           "Alpha",
+                                           rpass->name,
+                                           -1,
+                                           SOCK_FLOAT,
+                                           false,
+                                           available_sockets,
+                                           &prev_index);
+          }
+        }
+        BKE_image_release_ibuf(ima, ibuf, NULL);
+        return;
+      }
+    }
+  }
+
+  cmp_node_image_add_pass_output(ntree,
+                                 node,
+                                 "Image",
+                                 RE_PASSNAME_COMBINED,
+                                 -1,
+                                 SOCK_RGBA,
+                                 false,
+                                 available_sockets,
+                                 &prev_index);
+  cmp_node_image_add_pass_output(ntree,
+                                 node,
+                                 "Alpha",
+                                 RE_PASSNAME_COMBINED,
+                                 -1,
+                                 SOCK_FLOAT,
+                                 false,
+                                 available_sockets,
+                                 &prev_index);
+
+  if (ima) {
+    if (!ima->rr) {
+      cmp_node_image_add_pass_output(ntree,
+                                     node,
+                                     RE_PASSNAME_Z,
+                                     RE_PASSNAME_Z,
+                                     -1,
+                                     SOCK_FLOAT,
+                                     false,
+                                     available_sockets,
+                                     &prev_index);
+    }
+    BKE_image_release_ibuf(ima, ibuf, NULL);
+  }
 }
 
 typedef struct RLayerUpdateData {
-	LinkNodePair *available_sockets;
-	int prev_index;
+  LinkNodePair *available_sockets;
+  int prev_index;
 } RLayerUpdateData;
 
-void node_cmp_rlayers_register_pass(bNodeTree *ntree, bNode *node, Scene *scene, ViewLayer *view_layer, const char *name, int type)
+void node_cmp_rlayers_register_pass(
+    bNodeTree *ntree, bNode *node, Scene *scene, ViewLayer *view_layer, const char *name, int type)
 {
-	RLayerUpdateData *data = node->storage;
-
-	if (scene == NULL || view_layer == NULL || data == NULL || node->id != (ID *)scene) {
-		return;
-	}
-
-	ViewLayer *node_view_layer = BLI_findlink(&scene->view_layers, node->custom1);
-	if (node_view_layer != view_layer) {
-		return;
-	}
-
-	/* Special handling for the Combined pass to ensure compatibility. */
-	if (STREQ(name, RE_PASSNAME_COMBINED)) {
-		cmp_node_image_add_pass_output(ntree, node, "Image", name, -1, type, true, data->available_sockets, &data->prev_index);
-		cmp_node_image_add_pass_output(ntree, node, "Alpha", name, -1, SOCK_FLOAT, true, data->available_sockets, &data->prev_index);
-	}
-	else {
-		cmp_node_image_add_pass_output(ntree, node, name, name, -1, type, true, data->available_sockets, &data->prev_index);
-	}
+  RLayerUpdateData *data = node->storage;
+
+  if (scene == NULL || view_layer == NULL || data == NULL || node->id != (ID *)scene) {
+    return;
+  }
+
+  ViewLayer *node_view_layer = BLI_findlink(&scene->view_layers, node->custom1);
+  if (node_view_layer != view_layer) {
+    return;
+  }
+
+  /* Special handling for the Combined pass to ensure compatibility. */
+  if (STREQ(name, RE_PASSNAME_COMBINED)) {
+    cmp_node_image_add_pass_output(
+        ntree, node, "Image", name, -1, type, true, data->available_sockets, &data->prev_index);
+    cmp_node_image_add_pass_output(ntree,
+                                   node,
+                                   "Alpha",
+                                   name,
+                                   -1,
+                                   SOCK_FLOAT,
+                                   true,
+                                   data->available_sockets,
+                                   &data->prev_index);
+  }
+  else {
+    cmp_node_image_add_pass_output(
+        ntree, node, name, name, -1, type, true, data->available_sockets, &data->prev_index);
+  }
 }
 
-static void cmp_node_rlayer_create_outputs_cb(void *UNUSED(userdata), Scene *scene, ViewLayer *view_layer,
-                                              const char *name, int UNUSED(channels), const char *UNUSED(chanid), int type)
+static void cmp_node_rlayer_create_outputs_cb(void *UNUSED(userdata),
+                                              Scene *scene,
+                                              ViewLayer *view_layer,
+                                              const char *name,
+                                              int UNUSED(channels),
+                                              const char *UNUSED(chanid),
+                                              int type)
 {
-	/* Register the pass in all scenes that have a render layer node for this layer.
-	 * Since multiple scenes can be used in the compositor, the code must loop over all scenes
-	 * and check whether their nodetree has a node that needs to be updated. */
-	/* NOTE: using G_MAIN seems valid here,
-	 * unless we want to register that for every other temp Main we could generate??? */
-	ntreeCompositRegisterPass(scene->nodetree, scene, view_layer, name, type);
-
-	for (Scene *sce = G_MAIN->scenes.first; sce; sce = sce->id.next) {
-		if (sce->nodetree && sce != scene) {
-			ntreeCompositRegisterPass(sce->nodetree, scene, view_layer, name, type);
-		}
-	}
+  /* Register the pass in all scenes that have a render layer node for this layer.
+   * Since multiple scenes can be used in the compositor, the code must loop over all scenes
+   * and check whether their nodetree has a node that needs to be updated. */
+  /* NOTE: using G_MAIN seems valid here,
+   * unless we want to register that for every other temp Main we could generate??? */
+  ntreeCompositRegisterPass(scene->nodetree, scene, view_layer, name, type);
+
+  for (Scene *sce = G_MAIN->scenes.first; sce; sce = sce->id.next) {
+    if (sce->nodetree && sce != scene) {
+      ntreeCompositRegisterPass(sce->nodetree, scene, view_layer, name, type);
+    }
+  }
 }
 
-static void cmp_node_rlayer_create_outputs(bNodeTree *ntree, bNode *node, LinkNodePair *available_sockets)
+static void cmp_node_rlayer_create_outputs(bNodeTree *ntree,
+                                           bNode *node,
+                                           LinkNodePair *available_sockets)
 {
-	Scene *scene = (Scene *)node->id;
-
-	if (scene) {
-		RenderEngineType *engine_type = RE_engines_find(scene->r.engine);
-		if (engine_type && engine_type->update_render_passes) {
-			ViewLayer *view_layer = BLI_findlink(&scene->view_layers, node->custom1);
-			if (view_layer) {
-				RLayerUpdateData *data = MEM_mallocN(sizeof(RLayerUpdateData), "render layer update data");
-				data->available_sockets = available_sockets;
-				data->prev_index = -1;
-				node->storage = data;
-
-				RenderEngine *engine = RE_engine_create(engine_type);
-				RE_engine_update_render_passes(engine, scene, view_layer, cmp_node_rlayer_create_outputs_cb, NULL);
-				RE_engine_free(engine);
-
-				MEM_freeN(data);
-				node->storage = NULL;
-
-				return;
-			}
-		}
-	}
-
-	int prev_index = -1;
-	cmp_node_image_add_pass_output(ntree, node, "Image", RE_PASSNAME_COMBINED, RRES_OUT_IMAGE, SOCK_RGBA, true, available_sockets, &prev_index);
-	cmp_node_image_add_pass_output(ntree, node, "Alpha", RE_PASSNAME_COMBINED, RRES_OUT_ALPHA, SOCK_FLOAT, true, available_sockets, &prev_index);
+  Scene *scene = (Scene *)node->id;
+
+  if (scene) {
+    RenderEngineType *engine_type = RE_engines_find(scene->r.engine);
+    if (engine_type && engine_type->update_render_passes) {
+      ViewLayer *view_layer = BLI_findlink(&scene->view_layers, node->custom1);
+      if (view_layer) {
+        RLayerUpdateData *data = MEM_mallocN(sizeof(RLayerUpdateData), "render layer update data");
+        data->available_sockets = available_sockets;
+        data->prev_index = -1;
+        node->storage = data;
+
+        RenderEngine *engine = RE_engine_create(engine_type);
+        RE_engine_update_render_passes(
+            engine, scene, view_layer, cmp_node_rlayer_create_outputs_cb, NULL);
+        RE_engine_free(engine);
+
+        MEM_freeN(data);
+        node->storage = NULL;
+
+        return;
+      }
+    }
+  }
+
+  int prev_index = -1;
+  cmp_node_image_add_pass_output(ntree,
+                                 node,
+                                 "Image",
+                                 RE_PASSNAME_COMBINED,
+                                 RRES_OUT_IMAGE,
+                                 SOCK_RGBA,
+                                 true,
+                                 available_sockets,
+                                 &prev_index);
+  cmp_node_image_add_pass_output(ntree,
+                                 node,
+                                 "Alpha",
+                                 RE_PASSNAME_COMBINED,
+                                 RRES_OUT_ALPHA,
+                                 SOCK_FLOAT,
+                                 true,
+                                 available_sockets,
+                                 &prev_index);
 }
 
 /* XXX make this into a generic socket verification function for dynamic socket replacement (multilayer, groups, static templates) */
 static void cmp_node_image_verify_outputs(bNodeTree *ntree, bNode *node, bool rlayer)
 {
-	bNodeSocket *sock, *sock_next;
-	LinkNodePair available_sockets = {NULL, NULL};
-	int sock_index;
-
-	/* XXX make callback */
-	if (rlayer)
-		cmp_node_rlayer_create_outputs(ntree, node, &available_sockets);
-	else
-		cmp_node_image_create_outputs(ntree, node, &available_sockets);
-
-	/* Get rid of sockets whose passes are not available in the image.
-	 * If sockets that are not available would be deleted, the connections to them would be lost
-	 * when e.g. opening a file (since there's no render at all yet).
-	 * Therefore, sockets with connected links will just be set as unavailable.
-	 *
-	 * Another important detail comes from compatibility with the older socket model, where there
-	 * was a fixed socket per pass type that was just hidden or not. Therefore, older versions expect
-	 * the first 31 passes to belong to a specific pass type.
-	 * So, we keep those 31 always allocated before the others as well, even if they have no links attached. */
-	sock_index = 0;
-	for (sock = node->outputs.first; sock; sock = sock_next, sock_index++) {
-		sock_next = sock->next;
-		if (BLI_linklist_index(available_sockets.list, sock) >= 0) {
-			sock->flag &= ~(SOCK_UNAVAIL | SOCK_HIDDEN);
-		}
-		else {
-			bNodeLink *link;
-			for (link = ntree->links.first; link; link = link->next) {
-				if (link->fromsock == sock) break;
-			}
-			if (!link && (!rlayer || sock_index > 30)) {
-				MEM_freeN(sock->storage);
-				nodeRemoveSocket(ntree, node, sock);
-			}
-			else {
-				sock->flag |= SOCK_UNAVAIL;
-			}
-		}
-	}
-
-	BLI_linklist_free(available_sockets.list, NULL);
+  bNodeSocket *sock, *sock_next;
+  LinkNodePair available_sockets = {NULL, NULL};
+  int sock_index;
+
+  /* XXX make callback */
+  if (rlayer)
+    cmp_node_rlayer_create_outputs(ntree, node, &available_sockets);
+  else
+    cmp_node_image_create_outputs(ntree, node, &available_sockets);
+
+  /* Get rid of sockets whose passes are not available in the image.
+   * If sockets that are not available would be deleted, the connections to them would be lost
+   * when e.g. opening a file (since there's no render at all yet).
+   * Therefore, sockets with connected links will just be set as unavailable.
+   *
+   * Another important detail comes from compatibility with the older socket model, where there
+   * was a fixed socket per pass type that was just hidden or not. Therefore, older versions expect
+   * the first 31 passes to belong to a specific pass type.
+   * So, we keep those 31 always allocated before the others as well, even if they have no links attached. */
+  sock_index = 0;
+  for (sock = node->outputs.first; sock; sock = sock_next, sock_index++) {
+    sock_next = sock->next;
+    if (BLI_linklist_index(available_sockets.list, sock) >= 0) {
+      sock->flag &= ~(SOCK_UNAVAIL | SOCK_HIDDEN);
+    }
+    else {
+      bNodeLink *link;
+      for (link = ntree->links.first; link; link = link->next) {
+        if (link->fromsock == sock)
+          break;
+      }
+      if (!link && (!rlayer || sock_index > 30)) {
+        MEM_freeN(sock->storage);
+        nodeRemoveSocket(ntree, node, sock);
+      }
+      else {
+        sock->flag |= SOCK_UNAVAIL;
+      }
+    }
+  }
+
+  BLI_linklist_free(available_sockets.list, NULL);
 }
 
 static void cmp_node_image_update(bNodeTree *ntree, bNode *node)
 {
-	/* avoid unnecessary updates, only changes to the image/image user data are of interest */
-	if (node->update & NODE_UPDATE_ID)
-		cmp_node_image_verify_outputs(ntree, node, false);
+  /* avoid unnecessary updates, only changes to the image/image user data are of interest */
+  if (node->update & NODE_UPDATE_ID)
+    cmp_node_image_verify_outputs(ntree, node, false);
 
-	cmp_node_update_default(ntree, node);
+  cmp_node_update_default(ntree, node);
 }
 
 static void node_composit_init_image(bNodeTree *ntree, bNode *node)
 {
-	ImageUser *iuser = MEM_callocN(sizeof(ImageUser), "node image user");
-	node->storage = iuser;
-	iuser->frames = 1;
-	iuser->sfra = 1;
-	iuser->ok = 1;
-	iuser->flag |= IMA_ANIM_ALWAYS;
-
-	/* setup initial outputs */
-	cmp_node_image_verify_outputs(ntree, node, false);
+  ImageUser *iuser = MEM_callocN(sizeof(ImageUser), "node image user");
+  node->storage = iuser;
+  iuser->frames = 1;
+  iuser->sfra = 1;
+  iuser->ok = 1;
+  iuser->flag |= IMA_ANIM_ALWAYS;
+
+  /* setup initial outputs */
+  cmp_node_image_verify_outputs(ntree, node, false);
 }
 
 static void node_composit_free_image(bNode *node)
 {
-	bNodeSocket *sock;
+  bNodeSocket *sock;
 
-	/* free extra socket info */
-	for (sock = node->outputs.first; sock; sock = sock->next)
-		MEM_freeN(sock->storage);
+  /* free extra socket info */
+  for (sock = node->outputs.first; sock; sock = sock->next)
+    MEM_freeN(sock->storage);
 
-	MEM_freeN(node->storage);
+  MEM_freeN(node->storage);
 }
 
-static void node_composit_copy_image(bNodeTree *UNUSED(dest_ntree), bNode *dest_node, bNode *src_node)
+static void node_composit_copy_image(bNodeTree *UNUSED(dest_ntree),
+                                     bNode *dest_node,
+                                     bNode *src_node)
 {
-	bNodeSocket *sock;
+  bNodeSocket *sock;
 
-	dest_node->storage = MEM_dupallocN(src_node->storage);
+  dest_node->storage = MEM_dupallocN(src_node->storage);
 
-	/* copy extra socket info */
-	for (sock = src_node->outputs.first; sock; sock = sock->next)
-		sock->new_sock->storage = MEM_dupallocN(sock->storage);
+  /* copy extra socket info */
+  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)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_IMAGE, "Image", NODE_CLASS_INPUT, NODE_PREVIEW);
-	node_type_init(&ntype, node_composit_init_image);
-	node_type_storage(&ntype, "ImageUser", node_composit_free_image, node_composit_copy_image);
-	node_type_update(&ntype, cmp_node_image_update, NULL);
-	node_type_label(&ntype, node_image_label);
+  cmp_node_type_base(&ntype, CMP_NODE_IMAGE, "Image", NODE_CLASS_INPUT, NODE_PREVIEW);
+  node_type_init(&ntype, node_composit_init_image);
+  node_type_storage(&ntype, "ImageUser", node_composit_free_image, node_composit_copy_image);
+  node_type_update(&ntype, cmp_node_image_update, NULL);
+  node_type_label(&ntype, node_image_label);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
 
-
 /* **************** RENDER RESULT ******************** */
 
 void node_cmp_rlayers_outputs(bNodeTree *ntree, bNode *node)
 {
-	cmp_node_image_verify_outputs(ntree, node, true);
+  cmp_node_image_verify_outputs(ntree, node, true);
 }
 
 const char *node_cmp_rlayers_sock_to_pass(int sock_index)
 {
-	const char *sock_to_passname[] = {
-		RE_PASSNAME_COMBINED, RE_PASSNAME_COMBINED,
-		RE_PASSNAME_Z, RE_PASSNAME_NORMAL, RE_PASSNAME_UV, RE_PASSNAME_VECTOR, RE_PASSNAME_DEPRECATED,
-		RE_PASSNAME_DEPRECATED, RE_PASSNAME_DEPRECATED, RE_PASSNAME_SHADOW, RE_PASSNAME_AO,
-		RE_PASSNAME_DEPRECATED, RE_PASSNAME_DEPRECATED, RE_PASSNAME_DEPRECATED,
-		RE_PASSNAME_INDEXOB, RE_PASSNAME_INDEXMA, RE_PASSNAME_MIST, RE_PASSNAME_EMIT, RE_PASSNAME_ENVIRONMENT,
-		RE_PASSNAME_DIFFUSE_DIRECT, RE_PASSNAME_DIFFUSE_INDIRECT, RE_PASSNAME_DIFFUSE_COLOR,
-		RE_PASSNAME_GLOSSY_DIRECT, RE_PASSNAME_GLOSSY_INDIRECT, RE_PASSNAME_GLOSSY_COLOR,
-		RE_PASSNAME_TRANSM_DIRECT, RE_PASSNAME_TRANSM_INDIRECT, RE_PASSNAME_TRANSM_COLOR,
-		RE_PASSNAME_SUBSURFACE_DIRECT, RE_PASSNAME_SUBSURFACE_INDIRECT, RE_PASSNAME_SUBSURFACE_COLOR,
-	};
-	if (sock_index > 30) {
-		return NULL;
-	}
-	return sock_to_passname[sock_index];
+  const char *sock_to_passname[] = {
+      RE_PASSNAME_COMBINED,
+      RE_PASSNAME_COMBINED,
+      RE_PASSNAME_Z,
+      RE_PASSNAME_NORMAL,
+      RE_PASSNAME_UV,
+      RE_PASSNAME_VECTOR,
+      RE_PASSNAME_DEPRECATED,
+      RE_PASSNAME_DEPRECATED,
+      RE_PASSNAME_DEPRECATED,
+      RE_PASSNAME_SHADOW,
+      RE_PASSNAME_AO,
+      RE_PASSNAME_DEPRECATED,
+      RE_PASSNAME_DEPRECATED,
+      RE_PASSNAME_DEPRECATED,
+      RE_PASSNAME_INDEXOB,
+      RE_PASSNAME_INDEXMA,
+      RE_PASSNAME_MIST,
+      RE_PASSNAME_EMIT,
+      RE_PASSNAME_ENVIRONMENT,
+      RE_PASSNAME_DIFFUSE_DIRECT,
+      RE_PASSNAME_DIFFUSE_INDIRECT,
+      RE_PASSNAME_DIFFUSE_COLOR,
+      RE_PASSNAME_GLOSSY_DIRECT,
+      RE_PASSNAME_GLOSSY_INDIRECT,
+      RE_PASSNAME_GLOSSY_COLOR,
+      RE_PASSNAME_TRANSM_DIRECT,
+      RE_PASSNAME_TRANSM_INDIRECT,
+      RE_PASSNAME_TRANSM_COLOR,
+      RE_PASSNAME_SUBSURFACE_DIRECT,
+      RE_PASSNAME_SUBSURFACE_INDIRECT,
+      RE_PASSNAME_SUBSURFACE_COLOR,
+  };
+  if (sock_index > 30) {
+    return NULL;
+  }
+  return sock_to_passname[sock_index];
 }
 
 static void node_composit_init_rlayers(const bContext *C, PointerRNA *ptr)
 {
-	Scene *scene = CTX_data_scene(C);
-	bNode *node = ptr->data;
-	int sock_index = 0;
+  Scene *scene = CTX_data_scene(C);
+  bNode *node = ptr->data;
+  int sock_index = 0;
 
-	node->id = &scene->id;
+  node->id = &scene->id;
 
-	for (bNodeSocket *sock = node->outputs.first; sock; sock = sock->next, sock_index++) {
-		NodeImageLayer *sockdata = MEM_callocN(sizeof(NodeImageLayer), "node image layer");
-		sock->storage = sockdata;
+  for (bNodeSocket *sock = node->outputs.first; sock; sock = sock->next, sock_index++) {
+    NodeImageLayer *sockdata = MEM_callocN(sizeof(NodeImageLayer), "node image layer");
+    sock->storage = sockdata;
 
-		BLI_strncpy(sockdata->pass_name, node_cmp_rlayers_sock_to_pass(sock_index), sizeof(sockdata->pass_name));
-	}
+    BLI_strncpy(sockdata->pass_name,
+                node_cmp_rlayers_sock_to_pass(sock_index),
+                sizeof(sockdata->pass_name));
+  }
 }
 
 static bool node_composit_poll_rlayers(bNodeType *UNUSED(ntype), bNodeTree *ntree)
 {
-	if (STREQ(ntree->idname, "CompositorNodeTree")) {
-		Scene *scene;
-
-		/* XXX ugly: check if ntree is a local scene node tree.
-		 * Render layers node can only be used in local scene->nodetree,
-		 * since it directly links to the scene.
-		 */
-		for (scene = G.main->scenes.first; scene; scene = scene->id.next)
-			if (scene->nodetree == ntree)
-				break;
-
-		return (scene != NULL);
-	}
-	return false;
+  if (STREQ(ntree->idname, "CompositorNodeTree")) {
+    Scene *scene;
+
+    /* XXX ugly: check if ntree is a local scene node tree.
+     * Render layers node can only be used in local scene->nodetree,
+     * since it directly links to the scene.
+     */
+    for (scene = G.main->scenes.first; scene; scene = scene->id.next)
+      if (scene->nodetree == ntree)
+        break;
+
+    return (scene != NULL);
+  }
+  return false;
 }
 
 static void node_composit_free_rlayers(bNode *node)
 {
-	bNodeSocket *sock;
-
-	/* free extra socket info */
-	for (sock = node->outputs.first; sock; sock = sock->next) {
-		if (sock->storage) {
-			MEM_freeN(sock->storage);
-		}
-	}
+  bNodeSocket *sock;
+
+  /* free extra socket info */
+  for (sock = node->outputs.first; sock; sock = sock->next) {
+    if (sock->storage) {
+      MEM_freeN(sock->storage);
+    }
+  }
 }
 
-static void node_composit_copy_rlayers(bNodeTree *UNUSED(dest_ntree), bNode *UNUSED(dest_node), bNode *src_node)
+static void node_composit_copy_rlayers(bNodeTree *UNUSED(dest_ntree),
+                                       bNode *UNUSED(dest_node),
+                                       bNode *src_node)
 {
-	bNodeSocket *sock;
-
-	/* copy extra socket info */
-	for (sock = src_node->outputs.first; sock; sock = sock->next) {
-		if (sock->storage) {
-			sock->new_sock->storage = MEM_dupallocN(sock->storage);
-		}
-	}
+  bNodeSocket *sock;
+
+  /* copy extra socket info */
+  for (sock = src_node->outputs.first; sock; sock = sock->next) {
+    if (sock->storage) {
+      sock->new_sock->storage = MEM_dupallocN(sock->storage);
+    }
+  }
 }
 
 static void cmp_node_rlayers_update(bNodeTree *ntree, bNode *node)
 {
-	cmp_node_image_verify_outputs(ntree, node, true);
+  cmp_node_image_verify_outputs(ntree, node, true);
 
-	cmp_node_update_default(ntree, node);
+  cmp_node_update_default(ntree, node);
 }
 
 void register_node_type_cmp_rlayers(void)
 {
-	static bNodeType ntype;
-
-	cmp_node_type_base(&ntype, CMP_NODE_R_LAYERS, "Render Layers", NODE_CLASS_INPUT, NODE_PREVIEW);
-	node_type_socket_templates(&ntype, NULL, cmp_node_rlayers_out);
-	ntype.initfunc_api = node_composit_init_rlayers;
-	ntype.poll = node_composit_poll_rlayers;
-	node_type_storage(&ntype, NULL, node_composit_free_rlayers, node_composit_copy_rlayers);
-	node_type_update(&ntype, cmp_node_rlayers_update, NULL);
-	node_type_init(&ntype, node_cmp_rlayers_outputs);
-	node_type_size_preset(&ntype, NODE_SIZE_LARGE);
-
-	nodeRegisterType(&ntype);
+  static bNodeType ntype;
+
+  cmp_node_type_base(&ntype, CMP_NODE_R_LAYERS, "Render Layers", NODE_CLASS_INPUT, NODE_PREVIEW);
+  node_type_socket_templates(&ntype, NULL, cmp_node_rlayers_out);
+  ntype.initfunc_api = node_composit_init_rlayers;
+  ntype.poll = node_composit_poll_rlayers;
+  node_type_storage(&ntype, NULL, node_composit_free_rlayers, node_composit_copy_rlayers);
+  node_type_update(&ntype, cmp_node_rlayers_update, NULL);
+  node_type_init(&ntype, node_cmp_rlayers_outputs);
+  node_type_size_preset(&ntype, NODE_SIZE_LARGE);
+
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_inpaint.c b/source/blender/nodes/composite/nodes/node_composite_inpaint.c
index b5fb1b95e9f..036abd800f5 100644
--- a/source/blender/nodes/composite/nodes/node_composite_inpaint.c
+++ b/source/blender/nodes/composite/nodes/node_composite_inpaint.c
@@ -21,27 +21,20 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
-
 /* **************** Inpaint/ ******************** */
 
 static bNodeSocketTemplate cmp_node_inpaint_in[] = {
-	{SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
-	{   -1, 0, ""   }
-};
-static bNodeSocketTemplate cmp_node_inpaint_out[] = {
-	{SOCK_RGBA, 0, N_("Image")},
-	{   -1, 0, ""   }
-};
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f}, {-1, 0, ""}};
+static bNodeSocketTemplate cmp_node_inpaint_out[] = {{SOCK_RGBA, 0, N_("Image")}, {-1, 0, ""}};
 
 void register_node_type_cmp_inpaint(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_INPAINT, "Inpaint", NODE_CLASS_OP_FILTER, 0);
-	node_type_socket_templates(&ntype, cmp_node_inpaint_in, cmp_node_inpaint_out);
+  cmp_node_type_base(&ntype, CMP_NODE_INPAINT, "Inpaint", NODE_CLASS_OP_FILTER, 0);
+  node_type_socket_templates(&ntype, cmp_node_inpaint_in, cmp_node_inpaint_out);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_invert.c b/source/blender/nodes/composite/nodes/node_composite_invert.c
index 7f60180110a..e5ebe6e0423 100644
--- a/source/blender/nodes/composite/nodes/node_composite_invert.c
+++ b/source/blender/nodes/composite/nodes/node_composite_invert.c
@@ -25,29 +25,25 @@
 
 /* **************** INVERT ******************** */
 static bNodeSocketTemplate cmp_node_invert_in[] = {
-	{ SOCK_FLOAT, 1, N_("Fac"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
-	{ SOCK_RGBA, 1, N_("Color"), 1.0f, 1.0f, 1.0f, 1.0f},
-	{ -1, 0, "" }
-};
+    {SOCK_FLOAT, 1, N_("Fac"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
+    {SOCK_RGBA, 1, N_("Color"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {-1, 0, ""}};
 
-static bNodeSocketTemplate cmp_node_invert_out[] = {
-	{ SOCK_RGBA, 0, N_("Color")},
-	{ -1, 0, "" }
-};
+static bNodeSocketTemplate cmp_node_invert_out[] = {{SOCK_RGBA, 0, N_("Color")}, {-1, 0, ""}};
 
 static void node_composit_init_invert(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	node->custom1 |= CMP_CHAN_RGB;
+  node->custom1 |= CMP_CHAN_RGB;
 }
 
 /* custom1 = mix type */
 void register_node_type_cmp_invert(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_INVERT, "Invert", NODE_CLASS_OP_COLOR, 0);
-	node_type_socket_templates(&ntype, cmp_node_invert_in, cmp_node_invert_out);
-	node_type_init(&ntype, node_composit_init_invert);
+  cmp_node_type_base(&ntype, CMP_NODE_INVERT, "Invert", NODE_CLASS_OP_COLOR, 0);
+  node_type_socket_templates(&ntype, cmp_node_invert_in, cmp_node_invert_out);
+  node_type_init(&ntype, node_composit_init_invert);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_keying.c b/source/blender/nodes/composite/nodes/node_composite_keying.c
index 39b04c24133..0b29244aa70 100644
--- a/source/blender/nodes/composite/nodes/node_composite_keying.c
+++ b/source/blender/nodes/composite/nodes/node_composite_keying.c
@@ -32,46 +32,47 @@
 /* **************** Translate  ******************** */
 
 static bNodeSocketTemplate cmp_node_keying_in[] = {
-	{	SOCK_RGBA,  1, "Image",	        0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA,  1, "Key Color",     1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Garbage Matte", 0.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Core Matte",    0.0f, 1.0f, 1.0f, 1.0f},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 1, "Image", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+    {SOCK_RGBA, 1, "Key Color", 1.0f, 1.0f, 1.0f, 1.0f},
+    {SOCK_FLOAT, 1, "Garbage Matte", 0.0f, 1.0f, 1.0f, 1.0f},
+    {SOCK_FLOAT, 1, "Core Matte", 0.0f, 1.0f, 1.0f, 1.0f},
+    {-1, 0, ""},
 };
 
 static bNodeSocketTemplate cmp_node_keying_out[] = {
-	{	SOCK_RGBA,  0, "Image"},
-	{	SOCK_FLOAT, 0, "Matte"},
-	{	SOCK_FLOAT, 0, "Edges"},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, "Image"},
+    {SOCK_FLOAT, 0, "Matte"},
+    {SOCK_FLOAT, 0, "Edges"},
+    {-1, 0, ""},
 };
 
 static void node_composit_init_keying(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeKeyingData *data;
+  NodeKeyingData *data;
 
-	data = MEM_callocN(sizeof(NodeKeyingData), "node keying data");
+  data = MEM_callocN(sizeof(NodeKeyingData), "node keying data");
 
-	data->screen_balance = 0.5f;
-	data->despill_balance = 0.5f;
-	data->despill_factor = 1.0f;
-	data->edge_kernel_radius = 3;
-	data->edge_kernel_tolerance = 0.1f;
-	data->clip_white = 1.0f;
-	data->clip_black = 0.0f;
-	data->clip_white = 1.0f;
+  data->screen_balance = 0.5f;
+  data->despill_balance = 0.5f;
+  data->despill_factor = 1.0f;
+  data->edge_kernel_radius = 3;
+  data->edge_kernel_tolerance = 0.1f;
+  data->clip_white = 1.0f;
+  data->clip_black = 0.0f;
+  data->clip_white = 1.0f;
 
-	node->storage = data;
+  node->storage = data;
 }
 
 void register_node_type_cmp_keying(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_KEYING, "Keying", NODE_CLASS_MATTE, 0);
-	node_type_socket_templates(&ntype, cmp_node_keying_in, cmp_node_keying_out);
-	node_type_init(&ntype, node_composit_init_keying);
-	node_type_storage(&ntype, "NodeKeyingData", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(&ntype, CMP_NODE_KEYING, "Keying", NODE_CLASS_MATTE, 0);
+  node_type_socket_templates(&ntype, cmp_node_keying_in, cmp_node_keying_out);
+  node_type_init(&ntype, node_composit_init_keying);
+  node_type_storage(
+      &ntype, "NodeKeyingData", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c b/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c
index 8f1bfbfb002..a481c111396 100644
--- a/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c
+++ b/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c
@@ -31,27 +31,28 @@
 /* **************** Translate  ******************** */
 
 static bNodeSocketTemplate cmp_node_keyingscreen_out[] = {
-	{	SOCK_RGBA,  0, "Screen"},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, "Screen"},
+    {-1, 0, ""},
 };
 
 static void node_composit_init_keyingscreen(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeKeyingScreenData *data;
+  NodeKeyingScreenData *data;
 
-	data = MEM_callocN(sizeof(NodeKeyingScreenData), "node keyingscreen data");
+  data = MEM_callocN(sizeof(NodeKeyingScreenData), "node keyingscreen data");
 
-	node->storage = data;
+  node->storage = data;
 }
 
 void register_node_type_cmp_keyingscreen(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_KEYINGSCREEN, "Keying Screen", NODE_CLASS_MATTE, 0);
-	node_type_socket_templates(&ntype, NULL, cmp_node_keyingscreen_out);
-	node_type_init(&ntype, node_composit_init_keyingscreen);
-	node_type_storage(&ntype, "NodeKeyingScreenData", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(&ntype, CMP_NODE_KEYINGSCREEN, "Keying Screen", NODE_CLASS_MATTE, 0);
+  node_type_socket_templates(&ntype, NULL, cmp_node_keyingscreen_out);
+  node_type_init(&ntype, node_composit_init_keyingscreen);
+  node_type_storage(
+      &ntype, "NodeKeyingScreenData", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_lensdist.c b/source/blender/nodes/composite/nodes/node_composite_lensdist.c
index 3e4364f691f..5c5668cd034 100644
--- a/source/blender/nodes/composite/nodes/node_composite_lensdist.c
+++ b/source/blender/nodes/composite/nodes/node_composite_lensdist.c
@@ -21,36 +21,35 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 static bNodeSocketTemplate cmp_node_lensdist_in[] = {
-	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_FLOAT, 1, N_("Distort"), 	0.f, 0.f, 0.f, 0.f, -0.999f, 1.f, PROP_NONE},
-	{	SOCK_FLOAT, 1, N_("Dispersion"), 0.f, 0.f, 0.f, 0.f, 0.f, 1.f, PROP_NONE},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {SOCK_FLOAT, 1, N_("Distort"), 0.f, 0.f, 0.f, 0.f, -0.999f, 1.f, PROP_NONE},
+    {SOCK_FLOAT, 1, N_("Dispersion"), 0.f, 0.f, 0.f, 0.f, 0.f, 1.f, PROP_NONE},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate cmp_node_lensdist_out[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 static void node_composit_init_lensdist(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeLensDist *nld = MEM_callocN(sizeof(NodeLensDist), "node lensdist data");
-	nld->jit = nld->proj = nld->fit = 0;
-	node->storage = nld;
+  NodeLensDist *nld = MEM_callocN(sizeof(NodeLensDist), "node lensdist data");
+  nld->jit = nld->proj = nld->fit = 0;
+  node->storage = nld;
 }
 
-
 void register_node_type_cmp_lensdist(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_LENSDIST, "Lens Distortion", NODE_CLASS_DISTORT, 0);
-	node_type_socket_templates(&ntype, cmp_node_lensdist_in, cmp_node_lensdist_out);
-	node_type_init(&ntype, node_composit_init_lensdist);
-	node_type_storage(&ntype, "NodeLensDist", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(&ntype, CMP_NODE_LENSDIST, "Lens Distortion", NODE_CLASS_DISTORT, 0);
+  node_type_socket_templates(&ntype, cmp_node_lensdist_in, cmp_node_lensdist_out);
+  node_type_init(&ntype, node_composit_init_lensdist);
+  node_type_storage(
+      &ntype, "NodeLensDist", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_levels.c b/source/blender/nodes/composite/nodes/node_composite_levels.c
index 296194f5102..3accfeb1617 100644
--- a/source/blender/nodes/composite/nodes/node_composite_levels.c
+++ b/source/blender/nodes/composite/nodes/node_composite_levels.c
@@ -21,34 +21,32 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
-
 /* **************** LEVELS ******************** */
 static bNodeSocketTemplate cmp_node_view_levels_in[] = {
-	{	SOCK_RGBA, 1, N_("Image"), 0.0f, 0.0f, 0.0f, 1.0f},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 1, N_("Image"), 0.0f, 0.0f, 0.0f, 1.0f},
+    {-1, 0, ""},
 };
 
 static bNodeSocketTemplate cmp_node_view_levels_out[] = {
-	{SOCK_FLOAT, 0, N_("Mean")},
-	{SOCK_FLOAT, 0, N_("Std Dev")},
-	{-1, 0, ""},
+    {SOCK_FLOAT, 0, N_("Mean")},
+    {SOCK_FLOAT, 0, N_("Std Dev")},
+    {-1, 0, ""},
 };
 
 static void node_composit_init_view_levels(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	node->custom1 = 1; /*All channels*/
+  node->custom1 = 1; /*All channels*/
 }
 
 void register_node_type_cmp_view_levels(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_VIEW_LEVELS, "Levels", NODE_CLASS_OUTPUT, NODE_PREVIEW);
-	node_type_socket_templates(&ntype, cmp_node_view_levels_in, cmp_node_view_levels_out);
-	node_type_init(&ntype, node_composit_init_view_levels);
+  cmp_node_type_base(&ntype, CMP_NODE_VIEW_LEVELS, "Levels", NODE_CLASS_OUTPUT, NODE_PREVIEW);
+  node_type_socket_templates(&ntype, cmp_node_view_levels_in, cmp_node_view_levels_out);
+  node_type_init(&ntype, node_composit_init_view_levels);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c b/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
index db01397369c..66c7a5403ad 100644
--- a/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
@@ -21,38 +21,36 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
-
 /* ******************* Luma Matte Node ********************************* */
 static bNodeSocketTemplate cmp_node_luma_matte_in[] = {
-	{SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
-	{-1, 0, ""},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {-1, 0, ""},
 };
 
 static bNodeSocketTemplate cmp_node_luma_matte_out[] = {
-	{SOCK_RGBA, 0, N_("Image")},
-	{SOCK_FLOAT, 0, N_("Matte")},
-	{-1, 0, ""},
+    {SOCK_RGBA, 0, N_("Image")},
+    {SOCK_FLOAT, 0, N_("Matte")},
+    {-1, 0, ""},
 };
 
 static void node_composit_init_luma_matte(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeChroma *c = MEM_callocN(sizeof(NodeChroma), "node chroma");
-	node->storage = c;
-	c->t1 = 1.0f;
-	c->t2 = 0.0f;
+  NodeChroma *c = MEM_callocN(sizeof(NodeChroma), "node chroma");
+  node->storage = c;
+  c->t1 = 1.0f;
+  c->t2 = 0.0f;
 }
 
 void register_node_type_cmp_luma_matte(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_LUMA_MATTE, "Luminance Key", NODE_CLASS_MATTE, NODE_PREVIEW);
-	node_type_socket_templates(&ntype, cmp_node_luma_matte_in, cmp_node_luma_matte_out);
-	node_type_init(&ntype, node_composit_init_luma_matte);
-	node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(&ntype, CMP_NODE_LUMA_MATTE, "Luminance Key", NODE_CLASS_MATTE, NODE_PREVIEW);
+  node_type_socket_templates(&ntype, cmp_node_luma_matte_in, cmp_node_luma_matte_out);
+  node_type_init(&ntype, node_composit_init_luma_matte);
+  node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_mapRange.c b/source/blender/nodes/composite/nodes/node_composite_mapRange.c
index a7df95a5713..4f70d9c5f5d 100644
--- a/source/blender/nodes/composite/nodes/node_composite_mapRange.c
+++ b/source/blender/nodes/composite/nodes/node_composite_mapRange.c
@@ -21,29 +21,28 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 /* **************** MAP VALUE ******************** */
 static bNodeSocketTemplate cmp_node_map_range_in[] = {
-	{	SOCK_FLOAT, 1, N_("Value"),		1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, N_("From Min"),	0.0f, 1.0f, 1.0f, 1.0f, -10000.0f, 10000.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, N_("From Max"),	1.0f, 1.0f, 1.0f, 1.0f, -10000.0f, 10000.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, N_("To Min"),	0.0f, 1.0f, 1.0f, 1.0f, -10000.0f, 10000.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, N_("To Max"),	1.0f, 1.0f, 1.0f, 1.0f, -10000.0f, 10000.0f, PROP_NONE},
-	{	-1, 0, ""	},
+    {SOCK_FLOAT, 1, N_("Value"), 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+    {SOCK_FLOAT, 1, N_("From Min"), 0.0f, 1.0f, 1.0f, 1.0f, -10000.0f, 10000.0f, PROP_NONE},
+    {SOCK_FLOAT, 1, N_("From Max"), 1.0f, 1.0f, 1.0f, 1.0f, -10000.0f, 10000.0f, PROP_NONE},
+    {SOCK_FLOAT, 1, N_("To Min"), 0.0f, 1.0f, 1.0f, 1.0f, -10000.0f, 10000.0f, PROP_NONE},
+    {SOCK_FLOAT, 1, N_("To Max"), 1.0f, 1.0f, 1.0f, 1.0f, -10000.0f, 10000.0f, PROP_NONE},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate cmp_node_map_range_out[] = {
-	{	SOCK_FLOAT, 0, N_("Value")},
-	{	-1, 0, ""	},
+    {SOCK_FLOAT, 0, N_("Value")},
+    {-1, 0, ""},
 };
 
 void register_node_type_cmp_map_range(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_MAP_RANGE, "Map Range", NODE_CLASS_OP_VECTOR, 0);
-	node_type_socket_templates(&ntype, cmp_node_map_range_in, cmp_node_map_range_out);
+  cmp_node_type_base(&ntype, CMP_NODE_MAP_RANGE, "Map Range", NODE_CLASS_OP_VECTOR, 0);
+  node_type_socket_templates(&ntype, cmp_node_map_range_in, cmp_node_map_range_out);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_mapUV.c b/source/blender/nodes/composite/nodes/node_composite_mapUV.c
index aa3370d99fb..062d111dd70 100644
--- a/source/blender/nodes/composite/nodes/node_composite_mapUV.c
+++ b/source/blender/nodes/composite/nodes/node_composite_mapUV.c
@@ -21,27 +21,26 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 /* **************** Map UV  ******************** */
 
 static bNodeSocketTemplate cmp_node_mapuv_in[] = {
-	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_VECTOR, 1, N_("UV"),			1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {SOCK_VECTOR, 1, N_("UV"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate cmp_node_mapuv_out[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 void register_node_type_cmp_mapuv(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_MAP_UV, "Map UV", NODE_CLASS_DISTORT, 0);
-	node_type_socket_templates(&ntype, cmp_node_mapuv_in, cmp_node_mapuv_out);
+  cmp_node_type_base(&ntype, CMP_NODE_MAP_UV, "Map UV", NODE_CLASS_DISTORT, 0);
+  node_type_socket_templates(&ntype, cmp_node_mapuv_in, cmp_node_mapuv_out);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_mapValue.c b/source/blender/nodes/composite/nodes/node_composite_mapValue.c
index 5eff355c76d..08deb73f05f 100644
--- a/source/blender/nodes/composite/nodes/node_composite_mapValue.c
+++ b/source/blender/nodes/composite/nodes/node_composite_mapValue.c
@@ -21,32 +21,31 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 /* **************** MAP VALUE ******************** */
 static bNodeSocketTemplate cmp_node_map_value_in[] = {
-	{	SOCK_FLOAT, 1, N_("Value"),			1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	-1, 0, ""	},
+    {SOCK_FLOAT, 1, N_("Value"), 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate cmp_node_map_value_out[] = {
-	{	SOCK_FLOAT, 0, N_("Value")},
-	{	-1, 0, ""	},
+    {SOCK_FLOAT, 0, N_("Value")},
+    {-1, 0, ""},
 };
 
 static void node_composit_init_map_value(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	node->storage = BKE_texture_mapping_add(TEXMAP_TYPE_POINT);
+  node->storage = BKE_texture_mapping_add(TEXMAP_TYPE_POINT);
 }
 
 void register_node_type_cmp_map_value(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_MAP_VALUE, "Map Value", NODE_CLASS_OP_VECTOR, 0);
-	node_type_socket_templates(&ntype, cmp_node_map_value_in, cmp_node_map_value_out);
-	node_type_init(&ntype, node_composit_init_map_value);
-	node_type_storage(&ntype, "TexMapping", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(&ntype, CMP_NODE_MAP_VALUE, "Map Value", NODE_CLASS_OP_VECTOR, 0);
+  node_type_socket_templates(&ntype, cmp_node_map_value_in, cmp_node_map_value_out);
+  node_type_init(&ntype, node_composit_init_map_value);
+  node_type_storage(&ntype, "TexMapping", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_mask.c b/source/blender/nodes/composite/nodes/node_composite_mask.c
index 69f2931d236..fb50c99fa94 100644
--- a/source/blender/nodes/composite/nodes/node_composite_mask.c
+++ b/source/blender/nodes/composite/nodes/node_composite_mask.c
@@ -27,41 +27,38 @@
 
 /* **************** Translate  ******************** */
 
-static bNodeSocketTemplate cmp_node_mask_out[] = {
-	{   SOCK_FLOAT, 0, "Mask"},
-	{   -1, 0, ""   }
-};
+static bNodeSocketTemplate cmp_node_mask_out[] = {{SOCK_FLOAT, 0, "Mask"}, {-1, 0, ""}};
 
 static void node_composit_init_mask(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeMask *data = MEM_callocN(sizeof(NodeMask), "NodeMask");
-	data->size_x = data->size_y = 256;
-	node->storage = data;
+  NodeMask *data = MEM_callocN(sizeof(NodeMask), "NodeMask");
+  data->size_x = data->size_y = 256;
+  node->storage = data;
 
-	node->custom2 = 16;    /* samples */
-	node->custom3 = 0.5f;  /* shutter */
+  node->custom2 = 16;   /* samples */
+  node->custom3 = 0.5f; /* shutter */
 }
 
 static void node_mask_label(bNodeTree *UNUSED(ntree), bNode *node, char *label, int maxlen)
 {
-	if (node->id != NULL) {
-		BLI_strncpy(label, node->id->name + 2, maxlen);
-	}
-	else {
-		BLI_strncpy(label, IFACE_("Mask"), maxlen);
-	}
+  if (node->id != NULL) {
+    BLI_strncpy(label, node->id->name + 2, maxlen);
+  }
+  else {
+    BLI_strncpy(label, IFACE_("Mask"), maxlen);
+  }
 }
 
 void register_node_type_cmp_mask(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_MASK, "Mask", NODE_CLASS_INPUT, 0);
-	node_type_socket_templates(&ntype, NULL, cmp_node_mask_out);
-	node_type_init(&ntype, node_composit_init_mask);
-	node_type_label(&ntype, node_mask_label);
+  cmp_node_type_base(&ntype, CMP_NODE_MASK, "Mask", NODE_CLASS_INPUT, 0);
+  node_type_socket_templates(&ntype, NULL, cmp_node_mask_out);
+  node_type_init(&ntype, node_composit_init_mask);
+  node_type_label(&ntype, node_mask_label);
 
-	node_type_storage(&ntype, "NodeMask", node_free_standard_storage, node_copy_standard_storage);
+  node_type_storage(&ntype, "NodeMask", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_math.c b/source/blender/nodes/composite/nodes/node_composite_math.c
index 00d9dda8dcc..21a85b2168f 100644
--- a/source/blender/nodes/composite/nodes/node_composite_math.c
+++ b/source/blender/nodes/composite/nodes/node_composite_math.c
@@ -21,29 +21,23 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 /* **************** SCALAR MATH ******************** */
 static bNodeSocketTemplate cmp_node_math_in[] = {
-	{ SOCK_FLOAT, 1, N_("Value"), 0.5f, 0.5f, 0.5f, 1.0f, -10000.0f, 10000.0f, PROP_NONE},
-	{ SOCK_FLOAT, 1, N_("Value"), 0.5f, 0.5f, 0.5f, 1.0f, -10000.0f, 10000.0f, PROP_NONE},
-	{ -1, 0, "" }
-};
-
-static bNodeSocketTemplate cmp_node_math_out[] = {
-	{ SOCK_FLOAT, 0, N_("Value")},
-	{ -1, 0, "" }
-};
+    {SOCK_FLOAT, 1, N_("Value"), 0.5f, 0.5f, 0.5f, 1.0f, -10000.0f, 10000.0f, PROP_NONE},
+    {SOCK_FLOAT, 1, N_("Value"), 0.5f, 0.5f, 0.5f, 1.0f, -10000.0f, 10000.0f, PROP_NONE},
+    {-1, 0, ""}};
 
+static bNodeSocketTemplate cmp_node_math_out[] = {{SOCK_FLOAT, 0, N_("Value")}, {-1, 0, ""}};
 
 void register_node_type_cmp_math(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_MATH, "Math", NODE_CLASS_CONVERTOR, 0);
-	node_type_socket_templates(&ntype, cmp_node_math_in, cmp_node_math_out);
-	node_type_label(&ntype, node_math_label);
+  cmp_node_type_base(&ntype, CMP_NODE_MATH, "Math", NODE_CLASS_CONVERTOR, 0);
+  node_type_socket_templates(&ntype, cmp_node_math_in, cmp_node_math_out);
+  node_type_label(&ntype, node_math_label);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_mixrgb.c b/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
index a808a5faaa9..2c324c7c5f0 100644
--- a/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
+++ b/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
@@ -25,24 +25,24 @@
 
 /* **************** MIX RGB ******************** */
 static bNodeSocketTemplate cmp_node_mix_rgb_in[] = {
-	{	SOCK_FLOAT, 1, N_("Fac"),			1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
-	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
-	{	-1, 0, ""	},
+    {SOCK_FLOAT, 1, N_("Fac"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate cmp_node_mix_rgb_out[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 /* custom1 = mix type */
 void register_node_type_cmp_mix_rgb(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_MIX_RGB, "Mix", NODE_CLASS_OP_COLOR, NODE_PREVIEW);
-	node_type_socket_templates(&ntype, cmp_node_mix_rgb_in, cmp_node_mix_rgb_out);
-	node_type_label(&ntype, node_blend_label);
+  cmp_node_type_base(&ntype, CMP_NODE_MIX_RGB, "Mix", NODE_CLASS_OP_COLOR, NODE_PREVIEW);
+  node_type_socket_templates(&ntype, cmp_node_mix_rgb_in, cmp_node_mix_rgb_out);
+  node_type_label(&ntype, node_blend_label);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_movieclip.c b/source/blender/nodes/composite/nodes/node_composite_movieclip.c
index db8a1d52205..e871b764a82 100644
--- a/source/blender/nodes/composite/nodes/node_composite_movieclip.c
+++ b/source/blender/nodes/composite/nodes/node_composite_movieclip.c
@@ -26,34 +26,35 @@
 #include "BKE_context.h"
 
 static bNodeSocketTemplate cmp_node_movieclip_out[] = {
-	{	SOCK_RGBA,		0,	N_("Image")},
-	{	SOCK_FLOAT,		0,	N_("Alpha")},
-	{	SOCK_FLOAT,		1,	N_("Offset X")},
-	{	SOCK_FLOAT,		1,	N_("Offset Y")},
-	{	SOCK_FLOAT,		1,	N_("Scale")},
-	{	SOCK_FLOAT,		1,	N_("Angle")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {SOCK_FLOAT, 0, N_("Alpha")},
+    {SOCK_FLOAT, 1, N_("Offset X")},
+    {SOCK_FLOAT, 1, N_("Offset Y")},
+    {SOCK_FLOAT, 1, N_("Scale")},
+    {SOCK_FLOAT, 1, N_("Angle")},
+    {-1, 0, ""},
 };
 
 static void init(const bContext *C, PointerRNA *ptr)
 {
-	bNode *node = ptr->data;
-	Scene *scene = CTX_data_scene(C);
-	MovieClipUser *user = MEM_callocN(sizeof(MovieClipUser), "node movie clip user");
+  bNode *node = ptr->data;
+  Scene *scene = CTX_data_scene(C);
+  MovieClipUser *user = MEM_callocN(sizeof(MovieClipUser), "node movie clip user");
 
-	node->id = (ID *)scene->clip;
-	node->storage = user;
-	user->framenr = 1;
+  node->id = (ID *)scene->clip;
+  node->storage = user;
+  user->framenr = 1;
 }
 
 void register_node_type_cmp_movieclip(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_MOVIECLIP, "Movie Clip", NODE_CLASS_INPUT, NODE_PREVIEW);
-	node_type_socket_templates(&ntype, NULL, cmp_node_movieclip_out);
-	ntype.initfunc_api = init;
-	node_type_storage(&ntype, "MovieClipUser", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(&ntype, CMP_NODE_MOVIECLIP, "Movie Clip", NODE_CLASS_INPUT, NODE_PREVIEW);
+  node_type_socket_templates(&ntype, NULL, cmp_node_movieclip_out);
+  ntype.initfunc_api = init;
+  node_type_storage(
+      &ntype, "MovieClipUser", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c b/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
index 9366be94227..144fe5c44aa 100644
--- a/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
+++ b/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
@@ -28,55 +28,55 @@
 /* **************** Translate  ******************** */
 
 static bNodeSocketTemplate cmp_node_moviedistortion_in[] = {
-	{	SOCK_RGBA, 1, N_("Image"),			0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 1, N_("Image"), 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+    {-1, 0, ""},
 };
 
 static bNodeSocketTemplate cmp_node_moviedistortion_out[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 static void label(bNodeTree *UNUSED(ntree), bNode *node, char *label, int maxlen)
 {
-	if (node->custom1 == 0)
-		BLI_strncpy(label, IFACE_("Undistortion"), maxlen);
-	else
-		BLI_strncpy(label, IFACE_("Distortion"), maxlen);
+  if (node->custom1 == 0)
+    BLI_strncpy(label, IFACE_("Undistortion"), maxlen);
+  else
+    BLI_strncpy(label, IFACE_("Distortion"), maxlen);
 }
 
 static void init(const bContext *C, PointerRNA *ptr)
 {
-	bNode *node = ptr->data;
-	Scene *scene = CTX_data_scene(C);
+  bNode *node = ptr->data;
+  Scene *scene = CTX_data_scene(C);
 
-	node->id = (ID *)scene->clip;
+  node->id = (ID *)scene->clip;
 }
 
 static void storage_free(bNode *node)
 {
-	if (node->storage)
-		BKE_tracking_distortion_free(node->storage);
+  if (node->storage)
+    BKE_tracking_distortion_free(node->storage);
 
-	node->storage = NULL;
+  node->storage = NULL;
 }
 
 static void storage_copy(bNodeTree *UNUSED(dest_ntree), bNode *dest_node, bNode *src_node)
 {
-	if (src_node->storage)
-		dest_node->storage = BKE_tracking_distortion_copy(src_node->storage);
+  if (src_node->storage)
+    dest_node->storage = BKE_tracking_distortion_copy(src_node->storage);
 }
 
 void register_node_type_cmp_moviedistortion(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_MOVIEDISTORTION, "Movie Distortion", NODE_CLASS_DISTORT, 0);
-	node_type_socket_templates(&ntype, cmp_node_moviedistortion_in, cmp_node_moviedistortion_out);
-	node_type_label(&ntype, label);
+  cmp_node_type_base(&ntype, CMP_NODE_MOVIEDISTORTION, "Movie Distortion", NODE_CLASS_DISTORT, 0);
+  node_type_socket_templates(&ntype, cmp_node_moviedistortion_in, cmp_node_moviedistortion_out);
+  node_type_label(&ntype, label);
 
-	ntype.initfunc_api = init;
-	node_type_storage(&ntype, NULL, storage_free, storage_copy);
+  ntype.initfunc_api = init;
+  node_type_storage(&ntype, NULL, storage_free, storage_copy);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_normal.c b/source/blender/nodes/composite/nodes/node_composite_normal.c
index fd256dd32f3..f4a432a1125 100644
--- a/source/blender/nodes/composite/nodes/node_composite_normal.c
+++ b/source/blender/nodes/composite/nodes/node_composite_normal.c
@@ -21,27 +21,26 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 /* **************** NORMAL  ******************** */
 static bNodeSocketTemplate cmp_node_normal_in[] = {
-	{	SOCK_VECTOR, 1, N_("Normal"),	0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_DIRECTION},
-	{	-1, 0, ""	},
+    {SOCK_VECTOR, 1, N_("Normal"), 0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f, PROP_DIRECTION},
+    {-1, 0, ""},
 };
 
 static bNodeSocketTemplate cmp_node_normal_out[] = {
-	{	SOCK_VECTOR, 0, N_("Normal"), 0.0f, 0.0f, 1.0f, 0.0f, -1.0f, 1.0f, PROP_DIRECTION},
-	{	SOCK_FLOAT, 0, N_("Dot")},
-	{	-1, 0, ""	},
+    {SOCK_VECTOR, 0, N_("Normal"), 0.0f, 0.0f, 1.0f, 0.0f, -1.0f, 1.0f, PROP_DIRECTION},
+    {SOCK_FLOAT, 0, N_("Dot")},
+    {-1, 0, ""},
 };
 
 void register_node_type_cmp_normal(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_NORMAL, "Normal", NODE_CLASS_OP_VECTOR, 0);
-	node_type_socket_templates(&ntype, cmp_node_normal_in, cmp_node_normal_out);
+  cmp_node_type_base(&ntype, CMP_NODE_NORMAL, "Normal", NODE_CLASS_OP_VECTOR, 0);
+  node_type_socket_templates(&ntype, cmp_node_normal_in, cmp_node_normal_out);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_normalize.c b/source/blender/nodes/composite/nodes/node_composite_normalize.c
index 9ebe31b5c92..7036bd7ff0d 100644
--- a/source/blender/nodes/composite/nodes/node_composite_normalize.c
+++ b/source/blender/nodes/composite/nodes/node_composite_normalize.c
@@ -21,26 +21,19 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
-
 /* **************** NORMALIZE single channel, useful for Z buffer ******************** */
 static bNodeSocketTemplate cmp_node_normalize_in[] = {
-	{   SOCK_FLOAT, 1, N_("Value"),         1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{   -1, 0, ""   }
-};
-static bNodeSocketTemplate cmp_node_normalize_out[] = {
-	{   SOCK_FLOAT, 0, N_("Value")},
-	{   -1, 0, ""   }
-};
+    {SOCK_FLOAT, 1, N_("Value"), 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_NONE}, {-1, 0, ""}};
+static bNodeSocketTemplate cmp_node_normalize_out[] = {{SOCK_FLOAT, 0, N_("Value")}, {-1, 0, ""}};
 
 void register_node_type_cmp_normalize(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_NORMALIZE, "Normalize", NODE_CLASS_OP_VECTOR, 0);
-	node_type_socket_templates(&ntype, cmp_node_normalize_in, cmp_node_normalize_out);
+  cmp_node_type_base(&ntype, CMP_NODE_NORMALIZE, "Normalize", NODE_CLASS_OP_VECTOR, 0);
+  node_type_socket_templates(&ntype, cmp_node_normalize_in, cmp_node_normalize_out);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_outputFile.c b/source/blender/nodes/composite/nodes/node_composite_outputFile.c
index a7e3023cfcf..624065fa96d 100644
--- a/source/blender/nodes/composite/nodes/node_composite_outputFile.c
+++ b/source/blender/nodes/composite/nodes/node_composite_outputFile.c
@@ -21,7 +21,6 @@
  * \ingroup cmpnodes
  */
 
-
 #include <string.h>
 #include "BLI_utildefines.h"
 #include "BLI_string_utils.h"
@@ -34,222 +33,247 @@
 
 #include "intern/openexr/openexr_multi.h"
 
-
 /* **************** OUTPUT FILE ******************** */
 
 /* find unique path */
 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) {
-		if (sock != data->sock) {
-			NodeImageMultiFileSocket *sockdata = sock->storage;
-			if (STREQ(sockdata->path, name))
-				return true;
-		}
-	}
-	return false;
+  struct {
+    ListBase *lb;
+    bNodeSocket *sock;
+  } *data = arg;
+  bNodeSocket *sock;
+  for (sock = data->lb->first; sock; sock = sock->next) {
+    if (sock != data->sock) {
+      NodeImageMultiFileSocket *sockdata = sock->storage;
+      if (STREQ(sockdata->path, name))
+        return true;
+    }
+  }
+  return false;
 }
-void ntreeCompositOutputFileUniquePath(ListBase *list, bNodeSocket *sock, const char defname[], char delim)
+void ntreeCompositOutputFileUniquePath(ListBase *list,
+                                       bNodeSocket *sock,
+                                       const char defname[],
+                                       char delim)
 {
-	NodeImageMultiFileSocket *sockdata;
-	struct {ListBase *lb; bNodeSocket *sock; } data;
-	data.lb = list;
-	data.sock = sock;
-
-	/* See if we are given an empty string */
-	if (ELEM(NULL, sock, defname))
-		return;
-
-	sockdata = sock->storage;
-	BLI_uniquename_cb(unique_path_unique_check, &data, defname, delim, sockdata->path, sizeof(sockdata->path));
+  NodeImageMultiFileSocket *sockdata;
+  struct {
+    ListBase *lb;
+    bNodeSocket *sock;
+  } data;
+  data.lb = list;
+  data.sock = sock;
+
+  /* See if we are given an empty string */
+  if (ELEM(NULL, sock, defname))
+    return;
+
+  sockdata = sock->storage;
+  BLI_uniquename_cb(
+      unique_path_unique_check, &data, defname, delim, sockdata->path, sizeof(sockdata->path));
 }
 
 /* find unique EXR layer */
 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) {
-		if (sock != data->sock) {
-			NodeImageMultiFileSocket *sockdata = sock->storage;
-			if (STREQ(sockdata->layer, name))
-				return true;
-		}
-	}
-	return false;
+  struct {
+    ListBase *lb;
+    bNodeSocket *sock;
+  } *data = arg;
+  bNodeSocket *sock;
+  for (sock = data->lb->first; sock; sock = sock->next) {
+    if (sock != data->sock) {
+      NodeImageMultiFileSocket *sockdata = sock->storage;
+      if (STREQ(sockdata->layer, name))
+        return true;
+    }
+  }
+  return false;
 }
-void ntreeCompositOutputFileUniqueLayer(ListBase *list, bNodeSocket *sock, const char defname[], char delim)
+void ntreeCompositOutputFileUniqueLayer(ListBase *list,
+                                        bNodeSocket *sock,
+                                        const char defname[],
+                                        char delim)
 {
-	NodeImageMultiFileSocket *sockdata;
-	struct {ListBase *lb; bNodeSocket *sock; } data;
-	data.lb = list;
-	data.sock = sock;
-
-	/* See if we are given an empty string */
-	if (ELEM(NULL, sock, defname))
-		return;
-
-	sockdata = sock->storage;
-	BLI_uniquename_cb(unique_layer_unique_check, &data, defname, delim, sockdata->layer, sizeof(sockdata->layer));
+  NodeImageMultiFileSocket *sockdata;
+  struct {
+    ListBase *lb;
+    bNodeSocket *sock;
+  } data;
+  data.lb = list;
+  data.sock = sock;
+
+  /* See if we are given an empty string */
+  if (ELEM(NULL, sock, defname))
+    return;
+
+  sockdata = sock->storage;
+  BLI_uniquename_cb(
+      unique_layer_unique_check, &data, defname, delim, sockdata->layer, sizeof(sockdata->layer));
 }
 
-bNodeSocket *ntreeCompositOutputFileAddSocket(bNodeTree *ntree, bNode *node, const char *name, ImageFormatData *im_format)
+bNodeSocket *ntreeCompositOutputFileAddSocket(bNodeTree *ntree,
+                                              bNode *node,
+                                              const char *name,
+                                              ImageFormatData *im_format)
 {
-	NodeImageMultiFile *nimf = node->storage;
-	bNodeSocket *sock = nodeAddStaticSocket(ntree, node, SOCK_IN, SOCK_RGBA, PROP_NONE, NULL, name);
-
-	/* create format data for the input socket */
-	NodeImageMultiFileSocket *sockdata = MEM_callocN(sizeof(NodeImageMultiFileSocket), "socket image format");
-	sock->storage = sockdata;
-
-	BLI_strncpy_utf8(sockdata->path, name, sizeof(sockdata->path));
-	ntreeCompositOutputFileUniquePath(&node->inputs, sock, name, '_');
-	BLI_strncpy_utf8(sockdata->layer, name, sizeof(sockdata->layer));
-	ntreeCompositOutputFileUniqueLayer(&node->inputs, sock, name, '_');
-
-	if (im_format) {
-		sockdata->format = *im_format;
-		if (BKE_imtype_is_movie(sockdata->format.imtype)) {
-			sockdata->format.imtype = R_IMF_IMTYPE_OPENEXR;
-		}
-	}
-	else
-		BKE_imformat_defaults(&sockdata->format);
-	/* use node data format by default */
-	sockdata->use_node_format = true;
-
-	nimf->active_input = BLI_findindex(&node->inputs, sock);
-
-	return sock;
+  NodeImageMultiFile *nimf = node->storage;
+  bNodeSocket *sock = nodeAddStaticSocket(ntree, node, SOCK_IN, SOCK_RGBA, PROP_NONE, NULL, name);
+
+  /* create format data for the input socket */
+  NodeImageMultiFileSocket *sockdata = MEM_callocN(sizeof(NodeImageMultiFileSocket),
+                                                   "socket image format");
+  sock->storage = sockdata;
+
+  BLI_strncpy_utf8(sockdata->path, name, sizeof(sockdata->path));
+  ntreeCompositOutputFileUniquePath(&node->inputs, sock, name, '_');
+  BLI_strncpy_utf8(sockdata->layer, name, sizeof(sockdata->layer));
+  ntreeCompositOutputFileUniqueLayer(&node->inputs, sock, name, '_');
+
+  if (im_format) {
+    sockdata->format = *im_format;
+    if (BKE_imtype_is_movie(sockdata->format.imtype)) {
+      sockdata->format.imtype = R_IMF_IMTYPE_OPENEXR;
+    }
+  }
+  else
+    BKE_imformat_defaults(&sockdata->format);
+  /* use node data format by default */
+  sockdata->use_node_format = true;
+
+  nimf->active_input = BLI_findindex(&node->inputs, sock);
+
+  return sock;
 }
 
 int ntreeCompositOutputFileRemoveActiveSocket(bNodeTree *ntree, bNode *node)
 {
-	NodeImageMultiFile *nimf = node->storage;
-	bNodeSocket *sock = BLI_findlink(&node->inputs, nimf->active_input);
-	int totinputs = BLI_listbase_count(&node->inputs);
+  NodeImageMultiFile *nimf = node->storage;
+  bNodeSocket *sock = BLI_findlink(&node->inputs, nimf->active_input);
+  int totinputs = BLI_listbase_count(&node->inputs);
 
-	if (!sock)
-		return 0;
+  if (!sock)
+    return 0;
 
-	if (nimf->active_input == totinputs - 1)
-		--nimf->active_input;
+  if (nimf->active_input == totinputs - 1)
+    --nimf->active_input;
 
-	/* free format data */
-	MEM_freeN(sock->storage);
+  /* free format data */
+  MEM_freeN(sock->storage);
 
-	nodeRemoveSocket(ntree, node, sock);
-	return 1;
+  nodeRemoveSocket(ntree, node, sock);
+  return 1;
 }
 
 void ntreeCompositOutputFileSetPath(bNode *node, bNodeSocket *sock, const char *name)
 {
-	NodeImageMultiFileSocket *sockdata = sock->storage;
-	BLI_strncpy_utf8(sockdata->path, name, sizeof(sockdata->path));
-	ntreeCompositOutputFileUniquePath(&node->inputs, sock, name, '_');
+  NodeImageMultiFileSocket *sockdata = sock->storage;
+  BLI_strncpy_utf8(sockdata->path, name, sizeof(sockdata->path));
+  ntreeCompositOutputFileUniquePath(&node->inputs, sock, name, '_');
 }
 
 void ntreeCompositOutputFileSetLayer(bNode *node, bNodeSocket *sock, const char *name)
 {
-	NodeImageMultiFileSocket *sockdata = sock->storage;
-	BLI_strncpy_utf8(sockdata->layer, name, sizeof(sockdata->layer));
-	ntreeCompositOutputFileUniqueLayer(&node->inputs, sock, name, '_');
+  NodeImageMultiFileSocket *sockdata = sock->storage;
+  BLI_strncpy_utf8(sockdata->layer, name, sizeof(sockdata->layer));
+  ntreeCompositOutputFileUniqueLayer(&node->inputs, sock, name, '_');
 }
 
 /* XXX uses initfunc_api callback, regular initfunc does not support context yet */
 static void init_output_file(const bContext *C, PointerRNA *ptr)
 {
-	Scene *scene = CTX_data_scene(C);
-	bNodeTree *ntree = ptr->id.data;
-	bNode *node = ptr->data;
-	NodeImageMultiFile *nimf = MEM_callocN(sizeof(NodeImageMultiFile), "node image multi file");
-	ImageFormatData *format = NULL;
-	node->storage = nimf;
-
-	if (scene) {
-		RenderData *rd = &scene->r;
-
-		BLI_strncpy(nimf->base_path, rd->pic, sizeof(nimf->base_path));
-		nimf->format = rd->im_format;
-		if (BKE_imtype_is_movie(nimf->format.imtype)) {
-			nimf->format.imtype = R_IMF_IMTYPE_OPENEXR;
-		}
-
-		format = &nimf->format;
-	}
-	else
-		BKE_imformat_defaults(&nimf->format);
-
-	/* add one socket by default */
-	ntreeCompositOutputFileAddSocket(ntree, node, "Image", format);
+  Scene *scene = CTX_data_scene(C);
+  bNodeTree *ntree = ptr->id.data;
+  bNode *node = ptr->data;
+  NodeImageMultiFile *nimf = MEM_callocN(sizeof(NodeImageMultiFile), "node image multi file");
+  ImageFormatData *format = NULL;
+  node->storage = nimf;
+
+  if (scene) {
+    RenderData *rd = &scene->r;
+
+    BLI_strncpy(nimf->base_path, rd->pic, sizeof(nimf->base_path));
+    nimf->format = rd->im_format;
+    if (BKE_imtype_is_movie(nimf->format.imtype)) {
+      nimf->format.imtype = R_IMF_IMTYPE_OPENEXR;
+    }
+
+    format = &nimf->format;
+  }
+  else
+    BKE_imformat_defaults(&nimf->format);
+
+  /* add one socket by default */
+  ntreeCompositOutputFileAddSocket(ntree, node, "Image", format);
 }
 
 static void free_output_file(bNode *node)
 {
-	bNodeSocket *sock;
+  bNodeSocket *sock;
 
-	/* free storage data in sockets */
-	for (sock = node->inputs.first; sock; sock = sock->next) {
-		MEM_freeN(sock->storage);
-	}
+  /* free storage data in sockets */
+  for (sock = node->inputs.first; sock; sock = sock->next) {
+    MEM_freeN(sock->storage);
+  }
 
-	MEM_freeN(node->storage);
+  MEM_freeN(node->storage);
 }
 
 static void copy_output_file(bNodeTree *UNUSED(dest_ntree), bNode *dest_node, bNode *src_node)
 {
-	bNodeSocket *src_sock, *dest_sock;
+  bNodeSocket *src_sock, *dest_sock;
 
-	dest_node->storage = MEM_dupallocN(src_node->storage);
+  dest_node->storage = MEM_dupallocN(src_node->storage);
 
-	/* duplicate storage data in sockets */
-	for (src_sock = src_node->inputs.first, dest_sock = dest_node->inputs.first; src_sock && dest_sock; src_sock = src_sock->next, dest_sock = dest_sock->next) {
-		dest_sock->storage = MEM_dupallocN(src_sock->storage);
-	}
+  /* duplicate storage data in sockets */
+  for (src_sock = src_node->inputs.first, dest_sock = dest_node->inputs.first;
+       src_sock && dest_sock;
+       src_sock = src_sock->next, dest_sock = dest_sock->next) {
+    dest_sock->storage = MEM_dupallocN(src_sock->storage);
+  }
 }
 
 static void update_output_file(bNodeTree *ntree, bNode *node)
 {
-	bNodeSocket *sock, *sock_next;
-	PointerRNA ptr;
-
-	/* XXX fix for #36706: remove invalid sockets added with bpy API.
-	 * This is not ideal, but prevents crashes from missing storage.
-	 * FileOutput node needs a redesign to support this properly.
-	 */
-	for (sock = node->inputs.first; sock; sock = sock_next) {
-		sock_next = sock->next;
-		if (sock->storage == NULL) {
-			nodeRemoveSocket(ntree, node, sock);
-		}
-	}
-	for (sock = node->outputs.first; sock; sock = sock_next) {
-		sock_next = sock->next;
-		nodeRemoveSocket(ntree, node, sock);
-	}
-
-	cmp_node_update_default(ntree, node);
-
-	/* automatically update the socket type based on linked input */
-	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);
-		}
-	}
+  bNodeSocket *sock, *sock_next;
+  PointerRNA ptr;
+
+  /* XXX fix for #36706: remove invalid sockets added with bpy API.
+   * This is not ideal, but prevents crashes from missing storage.
+   * FileOutput node needs a redesign to support this properly.
+   */
+  for (sock = node->inputs.first; sock; sock = sock_next) {
+    sock_next = sock->next;
+    if (sock->storage == NULL) {
+      nodeRemoveSocket(ntree, node, sock);
+    }
+  }
+  for (sock = node->outputs.first; sock; sock = sock_next) {
+    sock_next = sock->next;
+    nodeRemoveSocket(ntree, node, sock);
+  }
+
+  cmp_node_update_default(ntree, node);
+
+  /* automatically update the socket type based on linked input */
+  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);
+    }
+  }
 }
 
 void register_node_type_cmp_output_file(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_OUTPUT_FILE, "File Output", NODE_CLASS_OUTPUT, NODE_PREVIEW);
-	node_type_socket_templates(&ntype, NULL, NULL);
-	ntype.initfunc_api = init_output_file;
-	node_type_storage(&ntype, "NodeImageMultiFile", free_output_file, copy_output_file);
-	node_type_update(&ntype, update_output_file, NULL);
+  cmp_node_type_base(&ntype, CMP_NODE_OUTPUT_FILE, "File Output", NODE_CLASS_OUTPUT, NODE_PREVIEW);
+  node_type_socket_templates(&ntype, NULL, NULL);
+  ntype.initfunc_api = init_output_file;
+  node_type_storage(&ntype, "NodeImageMultiFile", free_output_file, copy_output_file);
+  node_type_update(&ntype, update_output_file, NULL);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_pixelate.c b/source/blender/nodes/composite/nodes/node_composite_pixelate.c
index ca9159acf0e..be20ba6dcc1 100644
--- a/source/blender/nodes/composite/nodes/node_composite_pixelate.c
+++ b/source/blender/nodes/composite/nodes/node_composite_pixelate.c
@@ -21,27 +21,20 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
-
 /* **************** Pixelate ******************** */
 
 static bNodeSocketTemplate cmp_node_pixelate_in[] = {
-	{   SOCK_RGBA, 1, N_("Color"),      0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{   -1, 0, ""   }
-};
-static bNodeSocketTemplate cmp_node_pixelate_out[] = {
-	{   SOCK_RGBA, 0, N_("Color")},
-	{   -1, 0, ""   }
-};
+    {SOCK_RGBA, 1, N_("Color"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE}, {-1, 0, ""}};
+static bNodeSocketTemplate cmp_node_pixelate_out[] = {{SOCK_RGBA, 0, N_("Color")}, {-1, 0, ""}};
 
 void register_node_type_cmp_pixelate(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_PIXELATE, "Pixelate", NODE_CLASS_OP_FILTER, 0);
-	node_type_socket_templates(&ntype, cmp_node_pixelate_in, cmp_node_pixelate_out);
+  cmp_node_type_base(&ntype, CMP_NODE_PIXELATE, "Pixelate", NODE_CLASS_OP_FILTER, 0);
+  node_type_socket_templates(&ntype, cmp_node_pixelate_in, cmp_node_pixelate_out);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.c b/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.c
index 2e274f036cc..3b6094d7083 100644
--- a/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.c
+++ b/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.c
@@ -21,36 +21,36 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 static bNodeSocketTemplate cmp_node_planetrackdeform_in[] = {
-	{   SOCK_RGBA,  1, N_("Image"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{   -1, 0, ""   }
-};
+    {SOCK_RGBA, 1, N_("Image"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE}, {-1, 0, ""}};
 
 static bNodeSocketTemplate cmp_node_planetrackdeform_out[] = {
-	{	SOCK_RGBA,   0,  N_("Image")},
-	{	SOCK_FLOAT,  0,  N_("Plane")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {SOCK_FLOAT, 0, N_("Plane")},
+    {-1, 0, ""},
 };
 
 static void init(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodePlaneTrackDeformData *data = MEM_callocN(sizeof(NodePlaneTrackDeformData), "node plane track deform data");
-	data->motion_blur_samples = 16;
-	data->motion_blur_shutter = 0.5f;
-	node->storage = data;
+  NodePlaneTrackDeformData *data = MEM_callocN(sizeof(NodePlaneTrackDeformData),
+                                               "node plane track deform data");
+  data->motion_blur_samples = 16;
+  data->motion_blur_shutter = 0.5f;
+  node->storage = data;
 }
 
 void register_node_type_cmp_planetrackdeform(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_PLANETRACKDEFORM, "Plane Track Deform", NODE_CLASS_DISTORT, 0);
-	node_type_socket_templates(&ntype, cmp_node_planetrackdeform_in, cmp_node_planetrackdeform_out);
-	node_type_init(&ntype, init);
-	node_type_storage(&ntype, "NodePlaneTrackDeformData", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(
+      &ntype, CMP_NODE_PLANETRACKDEFORM, "Plane Track Deform", NODE_CLASS_DISTORT, 0);
+  node_type_socket_templates(&ntype, cmp_node_planetrackdeform_in, cmp_node_planetrackdeform_out);
+  node_type_init(&ntype, init);
+  node_type_storage(
+      &ntype, "NodePlaneTrackDeformData", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_premulkey.c b/source/blender/nodes/composite/nodes/node_composite_premulkey.c
index 273c61f88ec..4746596efec 100644
--- a/source/blender/nodes/composite/nodes/node_composite_premulkey.c
+++ b/source/blender/nodes/composite/nodes/node_composite_premulkey.c
@@ -21,26 +21,25 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 /* **************** Premul and Key Alpha Convert ******************** */
 
 static bNodeSocketTemplate cmp_node_premulkey_in[] = {
-	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate cmp_node_premulkey_out[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 void register_node_type_cmp_premulkey(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_PREMULKEY, "Alpha Convert", NODE_CLASS_CONVERTOR, 0);
-	node_type_socket_templates(&ntype, cmp_node_premulkey_in, cmp_node_premulkey_out);
+  cmp_node_type_base(&ntype, CMP_NODE_PREMULKEY, "Alpha Convert", NODE_CLASS_CONVERTOR, 0);
+  node_type_socket_templates(&ntype, cmp_node_premulkey_in, cmp_node_premulkey_out);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_rgb.c b/source/blender/nodes/composite/nodes/node_composite_rgb.c
index 85f6f617ef7..b551a8158a8 100644
--- a/source/blender/nodes/composite/nodes/node_composite_rgb.c
+++ b/source/blender/nodes/composite/nodes/node_composite_rgb.c
@@ -21,22 +21,21 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 /* **************** RGB ******************** */
 static bNodeSocketTemplate cmp_node_rgb_out[] = {
-	{	SOCK_RGBA, 0, N_("RGBA"), 0.5f, 0.5f, 0.5f, 1.0f},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("RGBA"), 0.5f, 0.5f, 0.5f, 1.0f},
+    {-1, 0, ""},
 };
 
 void register_node_type_cmp_rgb(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_RGB, "RGB", NODE_CLASS_INPUT, 0);
-	node_type_socket_templates(&ntype, NULL, cmp_node_rgb_out);
-	node_type_size_preset(&ntype, NODE_SIZE_SMALL);
+  cmp_node_type_base(&ntype, CMP_NODE_RGB, "RGB", NODE_CLASS_INPUT, 0);
+  node_type_socket_templates(&ntype, NULL, cmp_node_rgb_out);
+  node_type_size_preset(&ntype, NODE_SIZE_SMALL);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_rotate.c b/source/blender/nodes/composite/nodes/node_composite_rotate.c
index b43e1da5583..b60347a459a 100644
--- a/source/blender/nodes/composite/nodes/node_composite_rotate.c
+++ b/source/blender/nodes/composite/nodes/node_composite_rotate.c
@@ -21,33 +21,32 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 /* **************** Rotate  ******************** */
 
 static bNodeSocketTemplate cmp_node_rotate_in[] = {
-	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_FLOAT, 1, N_("Degr"),			0.0f, 0.0f, 0.0f, 0.0f, -10000.0f, 10000.0f, PROP_ANGLE},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {SOCK_FLOAT, 1, N_("Degr"), 0.0f, 0.0f, 0.0f, 0.0f, -10000.0f, 10000.0f, PROP_ANGLE},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate cmp_node_rotate_out[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 static void node_composit_init_rotate(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	node->custom1 = 1; /* Bilinear Filter*/
+  node->custom1 = 1; /* Bilinear Filter*/
 }
 
 void register_node_type_cmp_rotate(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_ROTATE, "Rotate", NODE_CLASS_DISTORT, 0);
-	node_type_socket_templates(&ntype, cmp_node_rotate_in, cmp_node_rotate_out);
-	node_type_init(&ntype, node_composit_init_rotate);
+  cmp_node_type_base(&ntype, CMP_NODE_ROTATE, "Rotate", NODE_CLASS_DISTORT, 0);
+  node_type_socket_templates(&ntype, cmp_node_rotate_in, cmp_node_rotate_out);
+  node_type_init(&ntype, node_composit_init_rotate);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_scale.c b/source/blender/nodes/composite/nodes/node_composite_scale.c
index 4bd9b5e5db7..1a0268f2a3e 100644
--- a/source/blender/nodes/composite/nodes/node_composite_scale.c
+++ b/source/blender/nodes/composite/nodes/node_composite_scale.c
@@ -21,47 +21,42 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 /* **************** Scale  ******************** */
 
 static bNodeSocketTemplate cmp_node_scale_in[] = {
-	{   SOCK_RGBA, 1, N_("Image"),          1.0f, 1.0f, 1.0f, 1.0f},
-	{   SOCK_FLOAT, 1, N_("X"),             1.0f, 0.0f, 0.0f, 0.0f, 0.0001f, CMP_SCALE_MAX, PROP_NONE},
-	{   SOCK_FLOAT, 1, N_("Y"),             1.0f, 0.0f, 0.0f, 0.0f, 0.0001f, CMP_SCALE_MAX, PROP_NONE},
-	{   -1, 0, ""   }
-};
-static bNodeSocketTemplate cmp_node_scale_out[] = {
-	{   SOCK_RGBA, 0, N_("Image")},
-	{   -1, 0, ""   }
-};
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {SOCK_FLOAT, 1, N_("X"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0001f, CMP_SCALE_MAX, PROP_NONE},
+    {SOCK_FLOAT, 1, N_("Y"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0001f, CMP_SCALE_MAX, PROP_NONE},
+    {-1, 0, ""}};
+static bNodeSocketTemplate cmp_node_scale_out[] = {{SOCK_RGBA, 0, N_("Image")}, {-1, 0, ""}};
 
 static void node_composite_update_scale(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	bNodeSocket *sock;
-	bool use_xy_scale = ELEM(node->custom1, CMP_SCALE_RELATIVE, CMP_SCALE_ABSOLUTE);
-
-	/* Only show X/Y scale factor inputs for modes using them! */
-	for (sock = node->inputs.first; sock; sock = sock->next) {
-		if (STR_ELEM(sock->name, "X", "Y")) {
-			if (use_xy_scale) {
-				sock->flag &= ~SOCK_UNAVAIL;
-			}
-			else {
-				sock->flag |= SOCK_UNAVAIL;
-			}
-		}
-	}
+  bNodeSocket *sock;
+  bool use_xy_scale = ELEM(node->custom1, CMP_SCALE_RELATIVE, CMP_SCALE_ABSOLUTE);
+
+  /* Only show X/Y scale factor inputs for modes using them! */
+  for (sock = node->inputs.first; sock; sock = sock->next) {
+    if (STR_ELEM(sock->name, "X", "Y")) {
+      if (use_xy_scale) {
+        sock->flag &= ~SOCK_UNAVAIL;
+      }
+      else {
+        sock->flag |= SOCK_UNAVAIL;
+      }
+    }
+  }
 }
 
 void register_node_type_cmp_scale(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_SCALE, "Scale", NODE_CLASS_DISTORT, 0);
-	node_type_socket_templates(&ntype, cmp_node_scale_in, cmp_node_scale_out);
-	node_type_update(&ntype, node_composite_update_scale, NULL);
+  cmp_node_type_base(&ntype, CMP_NODE_SCALE, "Scale", NODE_CLASS_DISTORT, 0);
+  node_type_socket_templates(&ntype, cmp_node_scale_in, cmp_node_scale_out);
+  node_type_update(&ntype, node_composite_update_scale, NULL);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c b/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
index 9cb249bab71..691042ed31c 100644
--- a/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
+++ b/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
@@ -21,53 +21,50 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
-
 /* **************** SEPARATE HSVA ******************** */
 static bNodeSocketTemplate cmp_node_sephsva_in[] = {
-	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate cmp_node_sephsva_out[] = {
-	{	SOCK_FLOAT, 0, N_("H")},
-	{	SOCK_FLOAT, 0, N_("S")},
-	{	SOCK_FLOAT, 0, N_("V")},
-	{	SOCK_FLOAT, 0, N_("A")},
-	{	-1, 0, ""	},
+    {SOCK_FLOAT, 0, N_("H")},
+    {SOCK_FLOAT, 0, N_("S")},
+    {SOCK_FLOAT, 0, N_("V")},
+    {SOCK_FLOAT, 0, N_("A")},
+    {-1, 0, ""},
 };
 
 void register_node_type_cmp_sephsva(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_SEPHSVA, "Separate HSVA", NODE_CLASS_CONVERTOR, 0);
-	node_type_socket_templates(&ntype, cmp_node_sephsva_in, cmp_node_sephsva_out);
+  cmp_node_type_base(&ntype, CMP_NODE_SEPHSVA, "Separate HSVA", NODE_CLASS_CONVERTOR, 0);
+  node_type_socket_templates(&ntype, cmp_node_sephsva_in, cmp_node_sephsva_out);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
 
-
 /* **************** COMBINE HSVA ******************** */
 static bNodeSocketTemplate cmp_node_combhsva_in[] = {
-	{	SOCK_FLOAT, 1, N_("H"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, N_("S"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, N_("V"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, N_("A"),			1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	-1, 0, ""	},
+    {SOCK_FLOAT, 1, N_("H"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+    {SOCK_FLOAT, 1, N_("S"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+    {SOCK_FLOAT, 1, N_("V"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+    {SOCK_FLOAT, 1, N_("A"), 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate cmp_node_combhsva_out[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 void register_node_type_cmp_combhsva(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_COMBHSVA, "Combine HSVA", NODE_CLASS_CONVERTOR, 0);
-	node_type_socket_templates(&ntype, cmp_node_combhsva_in, cmp_node_combhsva_out);
+  cmp_node_type_base(&ntype, CMP_NODE_COMBHSVA, "Combine HSVA", NODE_CLASS_CONVERTOR, 0);
+  node_type_socket_templates(&ntype, cmp_node_combhsva_in, cmp_node_combhsva_out);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c b/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
index ffa034883d8..e832024c22f 100644
--- a/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
+++ b/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
@@ -21,53 +21,50 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 /* **************** SEPARATE RGBA ******************** */
 static bNodeSocketTemplate cmp_node_seprgba_in[] = {
-	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate cmp_node_seprgba_out[] = {
-	{	SOCK_FLOAT, 0, N_("R")},
-	{	SOCK_FLOAT, 0, N_("G")},
-	{	SOCK_FLOAT, 0, N_("B")},
-	{	SOCK_FLOAT, 0, N_("A")},
-	{	-1, 0, ""	},
+    {SOCK_FLOAT, 0, N_("R")},
+    {SOCK_FLOAT, 0, N_("G")},
+    {SOCK_FLOAT, 0, N_("B")},
+    {SOCK_FLOAT, 0, N_("A")},
+    {-1, 0, ""},
 };
 
 void register_node_type_cmp_seprgba(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_SEPRGBA, "Separate RGBA", NODE_CLASS_CONVERTOR, 0);
-	node_type_socket_templates(&ntype, cmp_node_seprgba_in, cmp_node_seprgba_out);
+  cmp_node_type_base(&ntype, CMP_NODE_SEPRGBA, "Separate RGBA", NODE_CLASS_CONVERTOR, 0);
+  node_type_socket_templates(&ntype, cmp_node_seprgba_in, cmp_node_seprgba_out);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
 
-
-
 /* **************** COMBINE RGBA ******************** */
 static bNodeSocketTemplate cmp_node_combrgba_in[] = {
-	{	SOCK_FLOAT, 1, N_("R"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, N_("G"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, N_("B"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, N_("A"),			1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	-1, 0, ""	},
+    {SOCK_FLOAT, 1, N_("R"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+    {SOCK_FLOAT, 1, N_("G"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+    {SOCK_FLOAT, 1, N_("B"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+    {SOCK_FLOAT, 1, N_("A"), 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate cmp_node_combrgba_out[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 void register_node_type_cmp_combrgba(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_COMBRGBA, "Combine RGBA", NODE_CLASS_CONVERTOR, 0);
-	node_type_socket_templates(&ntype, cmp_node_combrgba_in, cmp_node_combrgba_out);
+  cmp_node_type_base(&ntype, CMP_NODE_COMBRGBA, "Combine RGBA", NODE_CLASS_CONVERTOR, 0);
+  node_type_socket_templates(&ntype, cmp_node_combrgba_in, cmp_node_combrgba_out);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c b/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
index 103a9c51a89..82d35dc6118 100644
--- a/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
+++ b/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
@@ -21,66 +21,58 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
-
 /* **************** SEPARATE YCCA ******************** */
 static bNodeSocketTemplate cmp_node_sepycca_in[] = {
-	{  SOCK_RGBA, 1, N_("Image"),        1.0f, 1.0f, 1.0f, 1.0f},
-	{  -1, 0, ""   }
-};
-static bNodeSocketTemplate cmp_node_sepycca_out[] = {
-	{  SOCK_FLOAT, 0, N_("Y")},
-	{  SOCK_FLOAT, 0, N_("Cb")},
-	{  SOCK_FLOAT, 0, N_("Cr")},
-	{  SOCK_FLOAT, 0, N_("A")},
-	{  -1, 0, ""   }
-};
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f}, {-1, 0, ""}};
+static bNodeSocketTemplate cmp_node_sepycca_out[] = {{SOCK_FLOAT, 0, N_("Y")},
+                                                     {SOCK_FLOAT, 0, N_("Cb")},
+                                                     {SOCK_FLOAT, 0, N_("Cr")},
+                                                     {SOCK_FLOAT, 0, N_("A")},
+                                                     {-1, 0, ""}};
 
 static void node_composit_init_mode_sepycca(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	node->custom1 = 1; /* BLI_YCC_ITU_BT709 */
+  node->custom1 = 1; /* BLI_YCC_ITU_BT709 */
 }
 
 void register_node_type_cmp_sepycca(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_SEPYCCA, "Separate YCbCrA", NODE_CLASS_CONVERTOR, 0);
-	node_type_socket_templates(&ntype, cmp_node_sepycca_in, cmp_node_sepycca_out);
-	node_type_init(&ntype, node_composit_init_mode_sepycca);
+  cmp_node_type_base(&ntype, CMP_NODE_SEPYCCA, "Separate YCbCrA", NODE_CLASS_CONVERTOR, 0);
+  node_type_socket_templates(&ntype, cmp_node_sepycca_in, cmp_node_sepycca_out);
+  node_type_init(&ntype, node_composit_init_mode_sepycca);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
 
-
-
 /* **************** COMBINE YCCA ******************** */
 static bNodeSocketTemplate cmp_node_combycca_in[] = {
-	{	SOCK_FLOAT, 1, N_("Y"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, N_("Cb"),			0.5f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, N_("Cr"),			0.5f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, N_("A"),			1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	-1, 0, ""	},
+    {SOCK_FLOAT, 1, N_("Y"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+    {SOCK_FLOAT, 1, N_("Cb"), 0.5f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+    {SOCK_FLOAT, 1, N_("Cr"), 0.5f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+    {SOCK_FLOAT, 1, N_("A"), 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate cmp_node_combycca_out[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 static void node_composit_init_mode_combycca(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	node->custom1 = 1; /* BLI_YCC_ITU_BT709 */
+  node->custom1 = 1; /* BLI_YCC_ITU_BT709 */
 }
 
 void register_node_type_cmp_combycca(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_COMBYCCA, "Combine YCbCrA", NODE_CLASS_CONVERTOR, 0);
-	node_type_socket_templates(&ntype, cmp_node_combycca_in, cmp_node_combycca_out);
-	node_type_init(&ntype, node_composit_init_mode_combycca);
+  cmp_node_type_base(&ntype, CMP_NODE_COMBYCCA, "Combine YCbCrA", NODE_CLASS_CONVERTOR, 0);
+  node_type_socket_templates(&ntype, cmp_node_combycca_in, cmp_node_combycca_out);
+  node_type_init(&ntype, node_composit_init_mode_combycca);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c b/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
index d8022080ef1..b3277da2586 100644
--- a/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
+++ b/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
@@ -21,54 +21,46 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
-
 /* **************** SEPARATE YUVA ******************** */
 static bNodeSocketTemplate cmp_node_sepyuva_in[] = {
-	{  SOCK_RGBA, 1, N_("Image"),        1.0f, 1.0f, 1.0f, 1.0f},
-	{  -1, 0, ""   }
-};
-static bNodeSocketTemplate cmp_node_sepyuva_out[] = {
-	{  SOCK_FLOAT, 0, N_("Y")},
-	{  SOCK_FLOAT, 0, N_("U")},
-	{  SOCK_FLOAT, 0, N_("V")},
-	{  SOCK_FLOAT, 0, N_("A")},
-	{  -1, 0, ""   }
-};
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f}, {-1, 0, ""}};
+static bNodeSocketTemplate cmp_node_sepyuva_out[] = {{SOCK_FLOAT, 0, N_("Y")},
+                                                     {SOCK_FLOAT, 0, N_("U")},
+                                                     {SOCK_FLOAT, 0, N_("V")},
+                                                     {SOCK_FLOAT, 0, N_("A")},
+                                                     {-1, 0, ""}};
 
 void register_node_type_cmp_sepyuva(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_SEPYUVA, "Separate YUVA", NODE_CLASS_CONVERTOR, 0);
-	node_type_socket_templates(&ntype, cmp_node_sepyuva_in, cmp_node_sepyuva_out);
+  cmp_node_type_base(&ntype, CMP_NODE_SEPYUVA, "Separate YUVA", NODE_CLASS_CONVERTOR, 0);
+  node_type_socket_templates(&ntype, cmp_node_sepyuva_in, cmp_node_sepyuva_out);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
 
-
-
 /* **************** COMBINE YUVA ******************** */
 static bNodeSocketTemplate cmp_node_combyuva_in[] = {
-	{	SOCK_FLOAT, 1, N_("Y"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, N_("U"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, N_("V"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, N_("A"),			1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-	{	-1, 0, ""	},
+    {SOCK_FLOAT, 1, N_("Y"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+    {SOCK_FLOAT, 1, N_("U"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+    {SOCK_FLOAT, 1, N_("V"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+    {SOCK_FLOAT, 1, N_("A"), 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate cmp_node_combyuva_out[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 void register_node_type_cmp_combyuva(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_COMBYUVA, "Combine YUVA", NODE_CLASS_CONVERTOR, 0);
-	node_type_socket_templates(&ntype, cmp_node_combyuva_in, cmp_node_combyuva_out);
+  cmp_node_type_base(&ntype, CMP_NODE_COMBYUVA, "Combine YUVA", NODE_CLASS_CONVERTOR, 0);
+  node_type_socket_templates(&ntype, cmp_node_combyuva_in, cmp_node_combyuva_out);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_setalpha.c b/source/blender/nodes/composite/nodes/node_composite_setalpha.c
index 0ef738f0bda..519f2742bc8 100644
--- a/source/blender/nodes/composite/nodes/node_composite_setalpha.c
+++ b/source/blender/nodes/composite/nodes/node_composite_setalpha.c
@@ -21,26 +21,25 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 /* **************** SET ALPHA ******************** */
 static bNodeSocketTemplate cmp_node_setalpha_in[] = {
-	{	SOCK_RGBA, 1, N_("Image"),			0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 1, N_("Alpha"),			1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 1, N_("Image"), 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_FLOAT, 1, N_("Alpha"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate cmp_node_setalpha_out[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 void register_node_type_cmp_setalpha(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_SETALPHA, "Set Alpha", NODE_CLASS_CONVERTOR, 0);
-	node_type_socket_templates(&ntype, cmp_node_setalpha_in, cmp_node_setalpha_out);
+  cmp_node_type_base(&ntype, CMP_NODE_SETALPHA, "Set Alpha", NODE_CLASS_CONVERTOR, 0);
+  node_type_socket_templates(&ntype, cmp_node_setalpha_in, cmp_node_setalpha_out);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_splitViewer.c b/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
index d15fee2b716..8e577271ae1 100644
--- a/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
+++ b/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
@@ -21,7 +21,6 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 #include "BKE_image.h"
@@ -29,33 +28,34 @@
 
 /* **************** SPLIT VIEWER ******************** */
 static bNodeSocketTemplate cmp_node_splitviewer_in[] = {
-	{	SOCK_RGBA, 1, N_("Image"),		0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 1, N_("Image"),		0.0f, 0.0f, 0.0f, 1.0f},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 1, N_("Image"), 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_RGBA, 1, N_("Image"), 0.0f, 0.0f, 0.0f, 1.0f},
+    {-1, 0, ""},
 };
 
 static void node_composit_init_splitviewer(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	ImageUser *iuser = MEM_callocN(sizeof(ImageUser), "node image user");
-	node->storage = iuser;
-	iuser->sfra = 1;
-	iuser->ok = 1;
-	node->custom1 = 50;  /* default 50% split */
+  ImageUser *iuser = MEM_callocN(sizeof(ImageUser), "node image user");
+  node->storage = iuser;
+  iuser->sfra = 1;
+  iuser->ok = 1;
+  node->custom1 = 50; /* default 50% split */
 
-	node->id = (ID *)BKE_image_verify_viewer(G.main, IMA_TYPE_COMPOSITE, "Viewer Node");
+  node->id = (ID *)BKE_image_verify_viewer(G.main, IMA_TYPE_COMPOSITE, "Viewer Node");
 }
 
 void register_node_type_cmp_splitviewer(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_SPLITVIEWER, "Split Viewer", NODE_CLASS_OUTPUT, NODE_PREVIEW);
-	node_type_socket_templates(&ntype, cmp_node_splitviewer_in, NULL);
-	node_type_init(&ntype, node_composit_init_splitviewer);
-	node_type_storage(&ntype, "ImageUser", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(
+      &ntype, CMP_NODE_SPLITVIEWER, "Split Viewer", NODE_CLASS_OUTPUT, NODE_PREVIEW);
+  node_type_socket_templates(&ntype, cmp_node_splitviewer_in, NULL);
+  node_type_init(&ntype, node_composit_init_splitviewer);
+  node_type_storage(&ntype, "ImageUser", node_free_standard_storage, node_copy_standard_storage);
 
-	/* Do not allow muting for this node. */
-	node_type_internal_links(&ntype, NULL);
+  /* Do not allow muting for this node. */
+  node_type_internal_links(&ntype, NULL);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c b/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
index 631e463b14e..55d4ada0ca1 100644
--- a/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
+++ b/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
@@ -28,33 +28,33 @@
 /* **************** Translate  ******************** */
 
 static bNodeSocketTemplate cmp_node_stabilize2d_in[] = {
-	{	SOCK_RGBA, 1, N_("Image"),			0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 1, N_("Image"), 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+    {-1, 0, ""},
 };
 
 static bNodeSocketTemplate cmp_node_stabilize2d_out[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 static void init(const bContext *C, PointerRNA *ptr)
 {
-	bNode *node = ptr->data;
-	Scene *scene = CTX_data_scene(C);
+  bNode *node = ptr->data;
+  Scene *scene = CTX_data_scene(C);
 
-	node->id = (ID *)scene->clip;
+  node->id = (ID *)scene->clip;
 
-	/* default to bilinear, see node_sampler_type_items in rna_nodetree.c */
-	node->custom1 = 1;
+  /* default to bilinear, see node_sampler_type_items in rna_nodetree.c */
+  node->custom1 = 1;
 }
 
 void register_node_type_cmp_stabilize2d(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_STABILIZE2D, "Stabilize 2D", NODE_CLASS_DISTORT, 0);
-	node_type_socket_templates(&ntype, cmp_node_stabilize2d_in, cmp_node_stabilize2d_out);
-	ntype.initfunc_api = init;
+  cmp_node_type_base(&ntype, CMP_NODE_STABILIZE2D, "Stabilize 2D", NODE_CLASS_DISTORT, 0);
+  node_type_socket_templates(&ntype, cmp_node_stabilize2d_in, cmp_node_stabilize2d_out);
+  ntype.initfunc_api = init;
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_sunbeams.c b/source/blender/nodes/composite/nodes/node_composite_sunbeams.c
index cc949eded38..cdea27efdfc 100644
--- a/source/blender/nodes/composite/nodes/node_composite_sunbeams.c
+++ b/source/blender/nodes/composite/nodes/node_composite_sunbeams.c
@@ -24,32 +24,33 @@
 #include "node_composite_util.h"
 
 static bNodeSocketTemplate inputs[] = {
-	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate outputs[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 static void init(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeSunBeams *data = MEM_callocN(sizeof(NodeSunBeams), "sun beams node");
+  NodeSunBeams *data = MEM_callocN(sizeof(NodeSunBeams), "sun beams node");
 
-	data->source[0] = 0.5f;
-	data->source[1] = 0.5f;
+  data->source[0] = 0.5f;
+  data->source[1] = 0.5f;
 
-	node->storage = data;
+  node->storage = data;
 }
 
 void register_node_type_cmp_sunbeams(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_SUNBEAMS, "Sun Beams", NODE_CLASS_OP_FILTER, 0);
-	node_type_socket_templates(&ntype, inputs, outputs);
-	node_type_init(&ntype, init);
-	node_type_storage(&ntype, "NodeSunBeams", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(&ntype, CMP_NODE_SUNBEAMS, "Sun Beams", NODE_CLASS_OP_FILTER, 0);
+  node_type_socket_templates(&ntype, inputs, outputs);
+  node_type_init(&ntype, init);
+  node_type_storage(
+      &ntype, "NodeSunBeams", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_switch.c b/source/blender/nodes/composite/nodes/node_composite_switch.c
index 8ae4934f704..e4c44c5e340 100644
--- a/source/blender/nodes/composite/nodes/node_composite_switch.c
+++ b/source/blender/nodes/composite/nodes/node_composite_switch.c
@@ -25,23 +25,23 @@
 
 /* **************** MIX RGB ******************** */
 static bNodeSocketTemplate cmp_node_switch_in[] = {
-	{	SOCK_RGBA, 1, N_("Off"),		0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 1, N_("On"),			0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 1, N_("Off"), 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+    {SOCK_RGBA, 1, N_("On"), 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+    {-1, 0, ""},
 };
 
 static bNodeSocketTemplate cmp_node_switch_out[] = {
-	{	SOCK_RGBA, 0, N_("Image"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
+    {-1, 0, ""},
 };
 
 /* custom1 = mix type */
 void register_node_type_cmp_switch(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_SWITCH, "Switch", NODE_CLASS_LAYOUT, 0);
-	node_type_socket_templates(&ntype, cmp_node_switch_in, cmp_node_switch_out);
-	node_type_size_preset(&ntype, NODE_SIZE_SMALL);
-	nodeRegisterType(&ntype);
+  cmp_node_type_base(&ntype, CMP_NODE_SWITCH, "Switch", NODE_CLASS_LAYOUT, 0);
+  node_type_socket_templates(&ntype, cmp_node_switch_in, cmp_node_switch_out);
+  node_type_size_preset(&ntype, NODE_SIZE_SMALL);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_switchview.c b/source/blender/nodes/composite/nodes/node_composite_switchview.c
index b15e35e17ac..483185fa76b 100644
--- a/source/blender/nodes/composite/nodes/node_composite_switchview.c
+++ b/source/blender/nodes/composite/nodes/node_composite_switchview.c
@@ -27,118 +27,120 @@
 
 /* **************** SWITCH VIEW ******************** */
 static bNodeSocketTemplate cmp_node_switch_view_out[] = {
-	{	SOCK_RGBA, 0, N_("Image"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
+    {-1, 0, ""},
 };
 
-static bNodeSocket *ntreeCompositSwitchViewAddSocket(bNodeTree *ntree, bNode *node, const char *name)
+static bNodeSocket *ntreeCompositSwitchViewAddSocket(bNodeTree *ntree,
+                                                     bNode *node,
+                                                     const char *name)
 {
-	bNodeSocket *sock = nodeAddStaticSocket(ntree, node, SOCK_IN, SOCK_RGBA, PROP_NONE, NULL, name);
-	return sock;
+  bNodeSocket *sock = nodeAddStaticSocket(ntree, node, SOCK_IN, SOCK_RGBA, PROP_NONE, NULL, name);
+  return sock;
 }
 
 static void cmp_node_switch_view_sanitycheck(bNodeTree *ntree, bNode *node)
 {
-	bNodeSocket *sock;
+  bNodeSocket *sock;
 
-	if (!BLI_listbase_is_empty(&node->inputs))
-		return;
+  if (!BLI_listbase_is_empty(&node->inputs))
+    return;
 
-	sock = ntreeCompositSwitchViewAddSocket(ntree, node, "No View");
-	sock->flag |= SOCK_HIDDEN;
+  sock = ntreeCompositSwitchViewAddSocket(ntree, node, "No View");
+  sock->flag |= SOCK_HIDDEN;
 }
 
 static void cmp_node_switch_view_update(bNodeTree *ntree, bNode *node)
 {
-	bNodeSocket *sock;
-	SceneRenderView *srv;
-	Scene *scene = (Scene *)node->id;
-
-	/* only update when called from the operator button */
-	if (node->update != NODE_UPDATE_OPERATOR)
-		return;
-
-	if (scene == NULL) {
-		nodeRemoveAllSockets(ntree, node);
-		/* make sure there is always one socket */
-		cmp_node_switch_view_sanitycheck(ntree, node);
-		return;
-	}
-
-	/* remove the views that were removed */
-	sock = node->inputs.last;
-	while (sock) {
-		srv = BLI_findstring(&scene->r.views, sock->name, offsetof(SceneRenderView, name));
-
-		if (srv == NULL) {
-			bNodeSocket *sock_del = sock;
-			sock = sock->prev;
-			nodeRemoveSocket(ntree, node, sock_del);
-		}
-		else {
-			if (srv->viewflag & SCE_VIEW_DISABLE)
-				sock->flag |= SOCK_HIDDEN;
-			else
-				sock->flag &= ~SOCK_HIDDEN;
-
-			sock = sock->prev;
-		}
-	}
-
-	/* add the new views */
-	for (srv = scene->r.views.first; srv; srv = srv->next) {
-		sock = BLI_findstring(&node->inputs, srv->name, offsetof(bNodeSocket, name));
-
-		if (sock == NULL)
-			sock = ntreeCompositSwitchViewAddSocket(ntree, node, srv->name);
-
-		if (srv->viewflag & SCE_VIEW_DISABLE)
-			sock->flag |= SOCK_HIDDEN;
-		else
-			sock->flag &= ~SOCK_HIDDEN;
-	}
-
-	/* make sure there is always one socket */
-	cmp_node_switch_view_sanitycheck(ntree, node);
+  bNodeSocket *sock;
+  SceneRenderView *srv;
+  Scene *scene = (Scene *)node->id;
+
+  /* only update when called from the operator button */
+  if (node->update != NODE_UPDATE_OPERATOR)
+    return;
+
+  if (scene == NULL) {
+    nodeRemoveAllSockets(ntree, node);
+    /* make sure there is always one socket */
+    cmp_node_switch_view_sanitycheck(ntree, node);
+    return;
+  }
+
+  /* remove the views that were removed */
+  sock = node->inputs.last;
+  while (sock) {
+    srv = BLI_findstring(&scene->r.views, sock->name, offsetof(SceneRenderView, name));
+
+    if (srv == NULL) {
+      bNodeSocket *sock_del = sock;
+      sock = sock->prev;
+      nodeRemoveSocket(ntree, node, sock_del);
+    }
+    else {
+      if (srv->viewflag & SCE_VIEW_DISABLE)
+        sock->flag |= SOCK_HIDDEN;
+      else
+        sock->flag &= ~SOCK_HIDDEN;
+
+      sock = sock->prev;
+    }
+  }
+
+  /* add the new views */
+  for (srv = scene->r.views.first; srv; srv = srv->next) {
+    sock = BLI_findstring(&node->inputs, srv->name, offsetof(bNodeSocket, name));
+
+    if (sock == NULL)
+      sock = ntreeCompositSwitchViewAddSocket(ntree, node, srv->name);
+
+    if (srv->viewflag & SCE_VIEW_DISABLE)
+      sock->flag |= SOCK_HIDDEN;
+    else
+      sock->flag &= ~SOCK_HIDDEN;
+  }
+
+  /* make sure there is always one socket */
+  cmp_node_switch_view_sanitycheck(ntree, node);
 }
 
 static void init_switch_view(const bContext *C, PointerRNA *ptr)
 {
-	Scene *scene = CTX_data_scene(C);
-	bNodeTree *ntree = ptr->id.data;
-	bNode *node = ptr->data;
-	SceneRenderView *srv;
-	bNodeSocket *sock;
-	int nr;
+  Scene *scene = CTX_data_scene(C);
+  bNodeTree *ntree = ptr->id.data;
+  bNode *node = ptr->data;
+  SceneRenderView *srv;
+  bNodeSocket *sock;
+  int nr;
 
-	/* store scene for updates */
-	node->id = (ID *)scene;
+  /* store scene for updates */
+  node->id = (ID *)scene;
 
-	if (scene) {
-		RenderData *rd = &scene->r;
+  if (scene) {
+    RenderData *rd = &scene->r;
 
-		for (nr = 0, srv = rd->views.first; srv; srv = srv->next, nr++) {
-			sock = ntreeCompositSwitchViewAddSocket(ntree, node, srv->name);
+    for (nr = 0, srv = rd->views.first; srv; srv = srv->next, nr++) {
+      sock = ntreeCompositSwitchViewAddSocket(ntree, node, srv->name);
 
-			if ((srv->viewflag & SCE_VIEW_DISABLE))
-				sock->flag |= SOCK_HIDDEN;
-		}
-	}
+      if ((srv->viewflag & SCE_VIEW_DISABLE))
+        sock->flag |= SOCK_HIDDEN;
+    }
+  }
 
-	/* make sure there is always one socket */
-	cmp_node_switch_view_sanitycheck(ntree, node);
+  /* make sure there is always one socket */
+  cmp_node_switch_view_sanitycheck(ntree, node);
 }
 
 void register_node_type_cmp_switch_view(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_SWITCH_VIEW, "Switch View", NODE_CLASS_CONVERTOR, 0);
-	node_type_socket_templates(&ntype, NULL, cmp_node_switch_view_out);
+  cmp_node_type_base(&ntype, CMP_NODE_SWITCH_VIEW, "Switch View", NODE_CLASS_CONVERTOR, 0);
+  node_type_socket_templates(&ntype, NULL, cmp_node_switch_view_out);
 
-	ntype.initfunc_api = init_switch_view;
+  ntype.initfunc_api = init_switch_view;
 
-	node_type_update(&ntype, cmp_node_switch_view_update, NULL);
+  node_type_update(&ntype, cmp_node_switch_view_update, NULL);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_texture.c b/source/blender/nodes/composite/nodes/node_composite_texture.c
index e3d80d8e790..bc6b5f4f5fb 100644
--- a/source/blender/nodes/composite/nodes/node_composite_texture.c
+++ b/source/blender/nodes/composite/nodes/node_composite_texture.c
@@ -21,27 +21,26 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 /* **************** TEXTURE ******************** */
 static bNodeSocketTemplate cmp_node_texture_in[] = {
-	{	SOCK_VECTOR, 1, N_("Offset"),		0.0f, 0.0f, 0.0f, 0.0f, -2.0f, 2.0f, PROP_TRANSLATION},
-	{	SOCK_VECTOR, 1, N_("Scale"),		1.0f, 1.0f, 1.0f, 1.0f, -10.0f, 10.0f, PROP_XYZ},
-	{	-1, 0, ""	},
+    {SOCK_VECTOR, 1, N_("Offset"), 0.0f, 0.0f, 0.0f, 0.0f, -2.0f, 2.0f, PROP_TRANSLATION},
+    {SOCK_VECTOR, 1, N_("Scale"), 1.0f, 1.0f, 1.0f, 1.0f, -10.0f, 10.0f, PROP_XYZ},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate cmp_node_texture_out[] = {
-	{	SOCK_FLOAT, 0, N_("Value")},
-	{	SOCK_RGBA, 0, N_("Color")},
-	{	-1, 0, ""	},
+    {SOCK_FLOAT, 0, N_("Value")},
+    {SOCK_RGBA, 0, N_("Color")},
+    {-1, 0, ""},
 };
 
 void register_node_type_cmp_texture(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_TEXTURE, "Texture", NODE_CLASS_INPUT, NODE_PREVIEW);
-	node_type_socket_templates(&ntype, cmp_node_texture_in, cmp_node_texture_out);
+  cmp_node_type_base(&ntype, CMP_NODE_TEXTURE, "Texture", NODE_CLASS_INPUT, NODE_PREVIEW);
+  node_type_socket_templates(&ntype, cmp_node_texture_in, cmp_node_texture_out);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_tonemap.c b/source/blender/nodes/composite/nodes/node_composite_tonemap.c
index 4f365496a8c..27c73989da2 100644
--- a/source/blender/nodes/composite/nodes/node_composite_tonemap.c
+++ b/source/blender/nodes/composite/nodes/node_composite_tonemap.c
@@ -21,42 +21,41 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 static bNodeSocketTemplate cmp_node_tonemap_in[] = {
-	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate cmp_node_tonemap_out[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 static void node_composit_init_tonemap(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeTonemap *ntm = MEM_callocN(sizeof(NodeTonemap), "node tonemap data");
-	ntm->type = 1;
-	ntm->key = 0.18;
-	ntm->offset = 1;
-	ntm->gamma = 1;
-	ntm->f = 0;
-	ntm->m = 0;	// actual value is set according to input
-	// default a of 1 works well with natural HDR images, but not always so for cgi.
-	// Maybe should use 0 or at least lower initial value instead
-	ntm->a = 1;
-	ntm->c = 0;
-	node->storage = ntm;
+  NodeTonemap *ntm = MEM_callocN(sizeof(NodeTonemap), "node tonemap data");
+  ntm->type = 1;
+  ntm->key = 0.18;
+  ntm->offset = 1;
+  ntm->gamma = 1;
+  ntm->f = 0;
+  ntm->m = 0;  // actual value is set according to input
+  // default a of 1 works well with natural HDR images, but not always so for cgi.
+  // Maybe should use 0 or at least lower initial value instead
+  ntm->a = 1;
+  ntm->c = 0;
+  node->storage = ntm;
 }
 
 void register_node_type_cmp_tonemap(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_TONEMAP, "Tonemap", NODE_CLASS_OP_COLOR, 0);
-	node_type_socket_templates(&ntype, cmp_node_tonemap_in, cmp_node_tonemap_out);
-	node_type_init(&ntype, node_composit_init_tonemap);
-	node_type_storage(&ntype, "NodeTonemap", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(&ntype, CMP_NODE_TONEMAP, "Tonemap", NODE_CLASS_OP_COLOR, 0);
+  node_type_socket_templates(&ntype, cmp_node_tonemap_in, cmp_node_tonemap_out);
+  node_type_init(&ntype, node_composit_init_tonemap);
+  node_type_storage(&ntype, "NodeTonemap", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_trackpos.c b/source/blender/nodes/composite/nodes/node_composite_trackpos.c
index ffbe583155d..0547fb878e3 100644
--- a/source/blender/nodes/composite/nodes/node_composite_trackpos.c
+++ b/source/blender/nodes/composite/nodes/node_composite_trackpos.c
@@ -21,31 +21,31 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 static bNodeSocketTemplate cmp_node_trackpos_out[] = {
-	{	SOCK_FLOAT,		0,	N_("X")},
-	{	SOCK_FLOAT,		0,	N_("Y")},
-	{	SOCK_VECTOR, 		0,	N_("Speed"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_VELOCITY},
-	{	-1, 0, ""	},
+    {SOCK_FLOAT, 0, N_("X")},
+    {SOCK_FLOAT, 0, N_("Y")},
+    {SOCK_VECTOR, 0, N_("Speed"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_VELOCITY},
+    {-1, 0, ""},
 };
 
 static void init(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeTrackPosData *data = MEM_callocN(sizeof(NodeTrackPosData), "node track position data");
+  NodeTrackPosData *data = MEM_callocN(sizeof(NodeTrackPosData), "node track position data");
 
-	node->storage = data;
+  node->storage = data;
 }
 
 void register_node_type_cmp_trackpos(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_TRACKPOS, "Track Position", NODE_CLASS_INPUT, 0);
-	node_type_socket_templates(&ntype, NULL, cmp_node_trackpos_out);
-	node_type_init(&ntype, init);
-	node_type_storage(&ntype, "NodeTrackPosData", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(&ntype, CMP_NODE_TRACKPOS, "Track Position", NODE_CLASS_INPUT, 0);
+  node_type_socket_templates(&ntype, NULL, cmp_node_trackpos_out);
+  node_type_init(&ntype, init);
+  node_type_storage(
+      &ntype, "NodeTrackPosData", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_transform.c b/source/blender/nodes/composite/nodes/node_composite_transform.c
index 7819944d50b..70c27dac4ce 100644
--- a/source/blender/nodes/composite/nodes/node_composite_transform.c
+++ b/source/blender/nodes/composite/nodes/node_composite_transform.c
@@ -26,25 +26,25 @@
 /* **************** Transform  ******************** */
 
 static bNodeSocketTemplate cmp_node_transform_in[] = {
-	{	SOCK_RGBA,		1,	N_("Image"),			0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT,		1,	N_("X"),				0.0f, 0.0f, 0.0f, 0.0f, -10000.0f, 10000.0f},
-	{	SOCK_FLOAT,		1,	N_("Y"),				0.0f, 0.0f, 0.0f, 0.0f, -10000.0f, 10000.0f},
-	{	SOCK_FLOAT,		1,	N_("Angle"),			0.0f, 0.0f, 0.0f, 0.0f, -10000.0f, 10000.0f, PROP_ANGLE},
-	{	SOCK_FLOAT,		1,	N_("Scale"),			1.0f, 0.0f, 0.0f, 0.0f, 0.0001f, CMP_SCALE_MAX},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 1, N_("Image"), 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+    {SOCK_FLOAT, 1, N_("X"), 0.0f, 0.0f, 0.0f, 0.0f, -10000.0f, 10000.0f},
+    {SOCK_FLOAT, 1, N_("Y"), 0.0f, 0.0f, 0.0f, 0.0f, -10000.0f, 10000.0f},
+    {SOCK_FLOAT, 1, N_("Angle"), 0.0f, 0.0f, 0.0f, 0.0f, -10000.0f, 10000.0f, PROP_ANGLE},
+    {SOCK_FLOAT, 1, N_("Scale"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0001f, CMP_SCALE_MAX},
+    {-1, 0, ""},
 };
 
 static bNodeSocketTemplate cmp_node_transform_out[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 void register_node_type_cmp_transform(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_TRANSFORM, "Transform", NODE_CLASS_DISTORT, 0);
-	node_type_socket_templates(&ntype, cmp_node_transform_in, cmp_node_transform_out);
+  cmp_node_type_base(&ntype, CMP_NODE_TRANSFORM, "Transform", NODE_CLASS_DISTORT, 0);
+  node_type_socket_templates(&ntype, cmp_node_transform_in, cmp_node_transform_out);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_translate.c b/source/blender/nodes/composite/nodes/node_composite_translate.c
index e2973eaf037..a56014dce1f 100644
--- a/source/blender/nodes/composite/nodes/node_composite_translate.c
+++ b/source/blender/nodes/composite/nodes/node_composite_translate.c
@@ -21,37 +21,36 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
-
 /* **************** Translate  ******************** */
 
 static bNodeSocketTemplate cmp_node_translate_in[] = {
-	{	SOCK_RGBA, 1, N_("Image"),			1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_FLOAT, 1, N_("X"),	0.0f, 0.0f, 0.0f, 0.0f, -10000.0f, 10000.0f, PROP_NONE},
-	{	SOCK_FLOAT, 1, N_("Y"),	0.0f, 0.0f, 0.0f, 0.0f, -10000.0f, 10000.0f, PROP_NONE},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {SOCK_FLOAT, 1, N_("X"), 0.0f, 0.0f, 0.0f, 0.0f, -10000.0f, 10000.0f, PROP_NONE},
+    {SOCK_FLOAT, 1, N_("Y"), 0.0f, 0.0f, 0.0f, 0.0f, -10000.0f, 10000.0f, PROP_NONE},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate cmp_node_translate_out[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {-1, 0, ""},
 };
 
 static void node_composit_init_translate(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeTranslateData *data = MEM_callocN(sizeof(NodeTranslateData), "node translate data");
-	node->storage = data;
+  NodeTranslateData *data = MEM_callocN(sizeof(NodeTranslateData), "node translate data");
+  node->storage = data;
 }
 
 void register_node_type_cmp_translate(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_TRANSLATE, "Translate", NODE_CLASS_DISTORT, 0);
-	node_type_socket_templates(&ntype, cmp_node_translate_in, cmp_node_translate_out);
-	node_type_init(&ntype, node_composit_init_translate);
-	node_type_storage(&ntype, "NodeTranslateData", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(&ntype, CMP_NODE_TRANSLATE, "Translate", NODE_CLASS_DISTORT, 0);
+  node_type_socket_templates(&ntype, cmp_node_translate_in, cmp_node_translate_out);
+  node_type_init(&ntype, node_composit_init_translate);
+  node_type_storage(
+      &ntype, "NodeTranslateData", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_valToRgb.c b/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
index c135dac98d3..407ad502d79 100644
--- a/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
+++ b/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
@@ -21,58 +21,54 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
-
 /* **************** VALTORGB ******************** */
 static bNodeSocketTemplate cmp_node_valtorgb_in[] = {
-	{	SOCK_FLOAT, 1, N_("Fac"),			0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
-	{	-1, 0, ""	},
+    {SOCK_FLOAT, 1, N_("Fac"), 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_FACTOR},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate cmp_node_valtorgb_out[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	SOCK_FLOAT, 0, N_("Alpha")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {SOCK_FLOAT, 0, N_("Alpha")},
+    {-1, 0, ""},
 };
 
 static void node_composit_init_valtorgb(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	node->storage = BKE_colorband_add(true);
+  node->storage = BKE_colorband_add(true);
 }
 
 void register_node_type_cmp_valtorgb(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_VALTORGB, "ColorRamp", NODE_CLASS_CONVERTOR, 0);
-	node_type_socket_templates(&ntype, cmp_node_valtorgb_in, cmp_node_valtorgb_out);
-	node_type_size(&ntype, 240, 200, 320);
-	node_type_init(&ntype, node_composit_init_valtorgb);
-	node_type_storage(&ntype, "ColorBand", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(&ntype, CMP_NODE_VALTORGB, "ColorRamp", NODE_CLASS_CONVERTOR, 0);
+  node_type_socket_templates(&ntype, cmp_node_valtorgb_in, cmp_node_valtorgb_out);
+  node_type_size(&ntype, 240, 200, 320);
+  node_type_init(&ntype, node_composit_init_valtorgb);
+  node_type_storage(&ntype, "ColorBand", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
 
-
-
 /* **************** RGBTOBW ******************** */
 static bNodeSocketTemplate cmp_node_rgbtobw_in[] = {
-	{	SOCK_RGBA, 1, N_("Image"),			0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 1, N_("Image"), 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate cmp_node_rgbtobw_out[] = {
-	{	SOCK_FLOAT, 0, N_("Val"),			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
-	{	-1, 0, ""	},
+    {SOCK_FLOAT, 0, N_("Val"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
+    {-1, 0, ""},
 };
 
 void register_node_type_cmp_rgbtobw(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_RGBTOBW, "RGB to BW", NODE_CLASS_CONVERTOR, 0);
-	node_type_socket_templates(&ntype, cmp_node_rgbtobw_in, cmp_node_rgbtobw_out);
-	node_type_size_preset(&ntype, NODE_SIZE_SMALL);
+  cmp_node_type_base(&ntype, CMP_NODE_RGBTOBW, "RGB to BW", NODE_CLASS_CONVERTOR, 0);
+  node_type_socket_templates(&ntype, cmp_node_rgbtobw_in, cmp_node_rgbtobw_out);
+  node_type_size_preset(&ntype, NODE_SIZE_SMALL);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_value.c b/source/blender/nodes/composite/nodes/node_composite_value.c
index ecccb5d563e..9bfffee450a 100644
--- a/source/blender/nodes/composite/nodes/node_composite_value.c
+++ b/source/blender/nodes/composite/nodes/node_composite_value.c
@@ -21,22 +21,21 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 /* **************** VALUE ******************** */
 static bNodeSocketTemplate cmp_node_value_out[] = {
-	{	SOCK_FLOAT, 0, N_("Value"), 0.5f, 0, 0, 0, -FLT_MAX, FLT_MAX, PROP_NONE},
-	{	-1, 0, ""	},
+    {SOCK_FLOAT, 0, N_("Value"), 0.5f, 0, 0, 0, -FLT_MAX, FLT_MAX, PROP_NONE},
+    {-1, 0, ""},
 };
 
 void register_node_type_cmp_value(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_VALUE, "Value", NODE_CLASS_INPUT, 0);
-	node_type_socket_templates(&ntype, NULL, cmp_node_value_out);
-	node_type_size_preset(&ntype, NODE_SIZE_SMALL);
+  cmp_node_type_base(&ntype, CMP_NODE_VALUE, "Value", NODE_CLASS_INPUT, 0);
+  node_type_socket_templates(&ntype, NULL, cmp_node_value_out);
+  node_type_size_preset(&ntype, NODE_SIZE_SMALL);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_vecBlur.c b/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
index a21b5350d38..f1f44d07084 100644
--- a/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
+++ b/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
@@ -21,39 +21,34 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
-
 /* **************** VECTOR BLUR ******************** */
 static bNodeSocketTemplate cmp_node_vecblur_in[] = {
-	{   SOCK_RGBA, 1, N_("Image"),          1.0f, 1.0f, 1.0f, 1.0f},
-	{   SOCK_FLOAT, 1, N_("Z"),         0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
-	{   SOCK_VECTOR, 1, N_("Speed"),            0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_VELOCITY},
-	{   -1, 0, ""   }
-};
-static bNodeSocketTemplate cmp_node_vecblur_out[] = {
-	{   SOCK_RGBA, 0, N_("Image")},
-	{   -1, 0, ""   }
-};
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {SOCK_FLOAT, 1, N_("Z"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
+    {SOCK_VECTOR, 1, N_("Speed"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_VELOCITY},
+    {-1, 0, ""}};
+static bNodeSocketTemplate cmp_node_vecblur_out[] = {{SOCK_RGBA, 0, N_("Image")}, {-1, 0, ""}};
 
 static void node_composit_init_vecblur(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	NodeBlurData *nbd = MEM_callocN(sizeof(NodeBlurData), "node blur data");
-	node->storage = nbd;
-	nbd->samples = 32;
-	nbd->fac = 1.0f;
+  NodeBlurData *nbd = MEM_callocN(sizeof(NodeBlurData), "node blur data");
+  node->storage = nbd;
+  nbd->samples = 32;
+  nbd->fac = 1.0f;
 }
 
 /* custom1: itterations, custom2: maxspeed (0 = nolimit) */
 void register_node_type_cmp_vecblur(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_VECBLUR, "Vector Blur", NODE_CLASS_OP_FILTER, 0);
-	node_type_socket_templates(&ntype, cmp_node_vecblur_in, cmp_node_vecblur_out);
-	node_type_init(&ntype, node_composit_init_vecblur);
-	node_type_storage(&ntype, "NodeBlurData", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(&ntype, CMP_NODE_VECBLUR, "Vector Blur", NODE_CLASS_OP_FILTER, 0);
+  node_type_socket_templates(&ntype, cmp_node_vecblur_in, cmp_node_vecblur_out);
+  node_type_init(&ntype, node_composit_init_vecblur);
+  node_type_storage(
+      &ntype, "NodeBlurData", node_free_standard_storage, node_copy_standard_storage);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_viewer.c b/source/blender/nodes/composite/nodes/node_composite_viewer.c
index 7248f80a646..b7b7ed4c16a 100644
--- a/source/blender/nodes/composite/nodes/node_composite_viewer.c
+++ b/source/blender/nodes/composite/nodes/node_composite_viewer.c
@@ -21,43 +21,40 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
 #include "BKE_image.h"
 #include "BKE_global.h"
 
-
 /* **************** VIEWER ******************** */
 static bNodeSocketTemplate cmp_node_viewer_in[] = {
-	{   SOCK_RGBA, 1, N_("Image"),      0.0f, 0.0f, 0.0f, 1.0f},
-	{   SOCK_FLOAT, 1, N_("Alpha"),     1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
-	{   SOCK_FLOAT, 1, N_("Z"),         1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
-	{   -1, 0, ""   }
-};
+    {SOCK_RGBA, 1, N_("Image"), 0.0f, 0.0f, 0.0f, 1.0f},
+    {SOCK_FLOAT, 1, N_("Alpha"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
+    {SOCK_FLOAT, 1, N_("Z"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
+    {-1, 0, ""}};
 
 static void node_composit_init_viewer(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	ImageUser *iuser = MEM_callocN(sizeof(ImageUser), "node image user");
-	node->storage = iuser;
-	iuser->sfra = 1;
-	iuser->ok = 1;
-	node->custom3 = 0.5f;
-	node->custom4 = 0.5f;
-
-	node->id = (ID *)BKE_image_verify_viewer(G.main, IMA_TYPE_COMPOSITE, "Viewer Node");
+  ImageUser *iuser = MEM_callocN(sizeof(ImageUser), "node image user");
+  node->storage = iuser;
+  iuser->sfra = 1;
+  iuser->ok = 1;
+  node->custom3 = 0.5f;
+  node->custom4 = 0.5f;
+
+  node->id = (ID *)BKE_image_verify_viewer(G.main, IMA_TYPE_COMPOSITE, "Viewer Node");
 }
 
 void register_node_type_cmp_viewer(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_VIEWER, "Viewer", NODE_CLASS_OUTPUT, NODE_PREVIEW);
-	node_type_socket_templates(&ntype, cmp_node_viewer_in, NULL);
-	node_type_init(&ntype, node_composit_init_viewer);
-	node_type_storage(&ntype, "ImageUser", node_free_standard_storage, node_copy_standard_storage);
+  cmp_node_type_base(&ntype, CMP_NODE_VIEWER, "Viewer", NODE_CLASS_OUTPUT, NODE_PREVIEW);
+  node_type_socket_templates(&ntype, cmp_node_viewer_in, NULL);
+  node_type_init(&ntype, node_composit_init_viewer);
+  node_type_storage(&ntype, "ImageUser", node_free_standard_storage, node_copy_standard_storage);
 
-	node_type_internal_links(&ntype, NULL);
+  node_type_internal_links(&ntype, NULL);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }
diff --git a/source/blender/nodes/composite/nodes/node_composite_zcombine.c b/source/blender/nodes/composite/nodes/node_composite_zcombine.c
index dfda0d1e4a6..c22030d62f0 100644
--- a/source/blender/nodes/composite/nodes/node_composite_zcombine.c
+++ b/source/blender/nodes/composite/nodes/node_composite_zcombine.c
@@ -21,31 +21,29 @@
  * \ingroup cmpnodes
  */
 
-
 #include "node_composite_util.h"
 
-
 /* **************** Z COMBINE ******************** */
-	/* lazy coder note: node->custom2 is abused to send signal */
+/* lazy coder note: node->custom2 is abused to send signal */
 static bNodeSocketTemplate cmp_node_zcombine_in[] = {
-	{	SOCK_RGBA, 1, N_("Image"),		1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_FLOAT, 1, N_("Z"),			1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 10000.0f, PROP_NONE},
-	{	SOCK_RGBA, 1, N_("Image"),		1.0f, 1.0f, 1.0f, 1.0f},
-	{	SOCK_FLOAT, 1, N_("Z"),			1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 10000.0f, PROP_NONE},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {SOCK_FLOAT, 1, N_("Z"), 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 10000.0f, PROP_NONE},
+    {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+    {SOCK_FLOAT, 1, N_("Z"), 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 10000.0f, PROP_NONE},
+    {-1, 0, ""},
 };
 static bNodeSocketTemplate cmp_node_zcombine_out[] = {
-	{	SOCK_RGBA, 0, N_("Image")},
-	{	SOCK_FLOAT, 0, N_("Z")},
-	{	-1, 0, ""	},
+    {SOCK_RGBA, 0, N_("Image")},
+    {SOCK_FLOAT, 0, N_("Z")},
+    {-1, 0, ""},
 };
 
 void register_node_type_cmp_zcombine(void)
 {
-	static bNodeType ntype;
+  static bNodeType ntype;
 
-	cmp_node_type_base(&ntype, CMP_NODE_ZCOMBINE, "Z Combine", NODE_CLASS_OP_COLOR, 0);
-	node_type_socket_templates(&ntype, cmp_node_zcombine_in, cmp_node_zcombine_out);
+  cmp_node_type_base(&ntype, CMP_NODE_ZCOMBINE, "Z Combine", NODE_CLASS_OP_COLOR, 0);
+  node_type_socket_templates(&ntype, cmp_node_zcombine_in, cmp_node_zcombine_out);
 
-	nodeRegisterType(&ntype);
+  nodeRegisterType(&ntype);
 }