Cleanup: style, use braces for nodes

1 files changed, 60 insertions, 30 deletions

diff --git a/source/blender/nodes/intern/node_common.c b/source/blender/nodes/intern/node_common.c
index d9ea6425b01..ed4cdde67f0 100644
--- a/source/blender/nodes/intern/node_common.c
+++ b/source/blender/nodes/intern/node_common.c
@@ -52,18 +52,22 @@ enum {
 bNodeSocket *node_group_find_input_socket(bNode *groupnode, const char *identifier)
 {
   bNodeSocket *sock;
-  for (sock = groupnode->inputs.first; sock; sock = sock->next)
-    if (STREQ(sock->identifier, identifier))
+  for (sock = groupnode->inputs.first; sock; sock = sock->next) {
+    if (STREQ(sock->identifier, identifier)) {
       return sock;
+    }
+  }
   return NULL;
 }
 
 bNodeSocket *node_group_find_output_socket(bNode *groupnode, const char *identifier)
 {
   bNodeSocket *sock;
-  for (sock = groupnode->outputs.first; sock; sock = sock->next)
-    if (STREQ(sock->identifier, identifier))
+  for (sock = groupnode->outputs.first; sock; sock = sock->next) {
+    if (STREQ(sock->identifier, identifier)) {
       return sock;
+    }
+  }
   return NULL;
 }
 
@@ -77,13 +81,16 @@ bool node_group_poll_instance(bNode *node, bNodeTree *nodetree)
 {
   if (node->typeinfo->poll(node->typeinfo, nodetree)) {
     bNodeTree *grouptree = (bNodeTree *)node->id;
-    if (grouptree)
+    if (grouptree) {
       return nodeGroupPoll(nodetree, grouptree);
-    else
+    }
+    else {
       return true; /* without a linked node tree, group node is always ok */
+    }
   }
-  else
+  else {
     return false;
+  }
 }
 
 int nodeGroupPoll(bNodeTree *nodetree, bNodeTree *grouptree)
@@ -94,11 +101,13 @@ int nodeGroupPoll(bNodeTree *nodetree, bNodeTree *grouptree)
   /* unspecified node group, generally allowed
    * (if anything, should be avoided on operator level)
    */
-  if (grouptree == NULL)
+  if (grouptree == NULL) {
     return 1;
+  }
 
-  if (nodetree == grouptree)
+  if (nodetree == grouptree) {
     return 0;
+  }
 
   for (node = grouptree->nodes.first; node; node = node->next) {
     if (node->typeinfo->poll_instance && !node->typeinfo->poll_instance(node, nodetree)) {
@@ -116,20 +125,23 @@ static bNodeSocket *group_verify_socket(
   bNodeSocket *sock;
 
   for (sock = verify_lb->first; sock; sock = sock->next) {
-    if (STREQ(sock->identifier, iosock->identifier))
+    if (STREQ(sock->identifier, iosock->identifier)) {
       break;
+    }
   }
   if (sock) {
     strcpy(sock->name, iosock->name);
 
-    if (iosock->typeinfo->interface_verify_socket)
+    if (iosock->typeinfo->interface_verify_socket) {
       iosock->typeinfo->interface_verify_socket(ntree, iosock, gnode, sock, "interface");
+    }
   }
   else {
     sock = nodeAddSocket(ntree, gnode, in_out, iosock->idname, iosock->identifier, iosock->name);
 
-    if (iosock->typeinfo->interface_init_socket)
+    if (iosock->typeinfo->interface_init_socket) {
       iosock->typeinfo->interface_init_socket(ntree, iosock, gnode, sock, "interface");
+    }
   }
 
   /* remove from list temporarily, to distinguish from orphaned sockets */
@@ -216,8 +228,9 @@ static void node_reroute_update_internal_links(bNodeTree *ntree, bNode *node)
   bNodeLink *link;
 
   /* Security check! */
-  if (!ntree)
+  if (!ntree) {
     return;
+  }
 
   link = MEM_callocN(sizeof(bNodeLink), "internal node link");
   link->fromnode = node;
@@ -270,18 +283,22 @@ static void node_reroute_inherit_type_recursive(bNodeTree *ntree, bNode *node, i
   for (link = ntree->links.first; link; link = link->next) {
     bNode *fromnode = link->fromnode;
     bNode *tonode = link->tonode;
-    if (!tonode || !fromnode)
+    if (!tonode || !fromnode) {
       continue;
-    if (nodeLinkIsHidden(link))
+    }
+    if (nodeLinkIsHidden(link)) {
       continue;
+    }
 
     if (flag & REFINE_FORWARD) {
-      if (tonode == node && fromnode->type == NODE_REROUTE && !fromnode->done)
+      if (tonode == node && fromnode->type == NODE_REROUTE && !fromnode->done) {
         node_reroute_inherit_type_recursive(ntree, fromnode, REFINE_FORWARD);
+      }
     }
     if (flag & REFINE_BACKWARD) {
-      if (fromnode == node && tonode->type == NODE_REROUTE && !tonode->done)
+      if (fromnode == node && tonode->type == NODE_REROUTE && !tonode->done) {
         node_reroute_inherit_type_recursive(ntree, tonode, REFINE_BACKWARD);
+      }
     }
   }
 
@@ -327,12 +344,15 @@ void ntree_update_reroute_nodes(bNodeTree *ntree)
   bNode *node;
 
   /* clear tags */
-  for (node = ntree->nodes.first; node; node = node->next)
+  for (node = ntree->nodes.first; node; node = node->next) {
     node->done = 0;
+  }
 
-  for (node = ntree->nodes.first; node; node = node->next)
-    if (node->type == NODE_REROUTE && !node->done)
+  for (node = ntree->nodes.first; node; node = node->next) {
+    if (node->type == NODE_REROUTE && !node->done) {
       node_reroute_inherit_type_recursive(ntree, node, REFINE_FORWARD | REFINE_BACKWARD);
+    }
+  }
 }
 
 static bool node_is_connected_to_output_recursive(bNodeTree *ntree, bNode *node)
@@ -340,19 +360,22 @@ static bool node_is_connected_to_output_recursive(bNodeTree *ntree, bNode *node)
   bNodeLink *link;
 
   /* avoid redundant checks, and infinite loops in case of cyclic node links */
-  if (node->done)
+  if (node->done) {
     return false;
+  }
   node->done = 1;
 
   /* main test, done before child loop so it catches output nodes themselves as well */
-  if (node->typeinfo->nclass == NODE_CLASS_OUTPUT && node->flag & NODE_DO_OUTPUT)
+  if (node->typeinfo->nclass == NODE_CLASS_OUTPUT && node->flag & NODE_DO_OUTPUT) {
     return true;
+  }
 
   /* test all connected nodes, first positive find is sufficient to return true */
   for (link = ntree->links.first; link; link = link->next) {
     if (link->fromnode == node) {
-      if (node_is_connected_to_output_recursive(ntree, link->tonode))
+      if (node_is_connected_to_output_recursive(ntree, link->tonode)) {
         return true;
+      }
     }
   }
   return false;
@@ -363,8 +386,9 @@ bool BKE_node_is_connected_to_output(bNodeTree *ntree, bNode *node)
   bNode *tnode;
 
   /* clear flags */
-  for (tnode = ntree->nodes.first; tnode; tnode = tnode->next)
+  for (tnode = ntree->nodes.first; tnode; tnode = tnode->next) {
     tnode->done = 0;
+  }
 
   return node_is_connected_to_output_recursive(ntree, node);
 }
@@ -390,9 +414,11 @@ static void node_group_input_init(bNodeTree *ntree, bNode *node)
 bNodeSocket *node_group_input_find_socket(bNode *node, const char *identifier)
 {
   bNodeSocket *sock;
-  for (sock = node->outputs.first; sock; sock = sock->next)
-    if (STREQ(sock->identifier, identifier))
+  for (sock = node->outputs.first; sock; sock = sock->next) {
+    if (STREQ(sock->identifier, identifier)) {
       return sock;
+    }
+  }
   return NULL;
 }
 
@@ -422,8 +448,9 @@ static void node_group_input_update(bNodeTree *ntree, bNode *node)
   BLI_listbase_clear(&tmplinks);
   for (link = ntree->links.first; link; link = linknext) {
     linknext = link->next;
-    if (nodeLinkIsHidden(link))
+    if (nodeLinkIsHidden(link)) {
       continue;
+    }
 
     if (link->fromsock == extsock) {
       bNodeLink *tlink = MEM_callocN(sizeof(bNodeLink), "temporary link");
@@ -487,9 +514,11 @@ static void node_group_output_init(bNodeTree *ntree, bNode *node)
 bNodeSocket *node_group_output_find_socket(bNode *node, const char *identifier)
 {
   bNodeSocket *sock;
-  for (sock = node->inputs.first; sock; sock = sock->next)
-    if (STREQ(sock->identifier, identifier))
+  for (sock = node->inputs.first; sock; sock = sock->next) {
+    if (STREQ(sock->identifier, identifier)) {
       return sock;
+    }
+  }
   return NULL;
 }
 
@@ -519,8 +548,9 @@ static void node_group_output_update(bNodeTree *ntree, bNode *node)
   BLI_listbase_clear(&tmplinks);
   for (link = ntree->links.first; link; link = linknext) {
     linknext = link->next;
-    if (nodeLinkIsHidden(link))
+    if (nodeLinkIsHidden(link)) {
       continue;
+    }
 
     if (link->tosock == extsock) {
       bNodeLink *tlink = MEM_callocN(sizeof(bNodeLink), "temporary link");