From ab4a2aaf4a4b2b4e416aa1f113b30362cbe0dec3 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 24 Mar 2012 06:38:07 +0000 Subject: style cleanup: follow style guide for formatting of if/for/while loops, and else if's --- source/blender/nodes/intern/node_common.c | 58 +++++++++++++++---------------- source/blender/nodes/intern/node_exec.c | 36 +++++++++---------- source/blender/nodes/intern/node_socket.c | 18 +++++----- source/blender/nodes/intern/node_util.c | 2 +- 4 files changed, 57 insertions(+), 57 deletions(-) (limited to 'source/blender/nodes/intern') diff --git a/source/blender/nodes/intern/node_common.c b/source/blender/nodes/intern/node_common.c index c039365ec69..d2ec5ee032b 100644 --- a/source/blender/nodes/intern/node_common.c +++ b/source/blender/nodes/intern/node_common.c @@ -105,7 +105,7 @@ bNodeSocket *node_group_add_extern_socket(bNodeTree *UNUSED(ntree), ListBase *lb sock->default_value = node_socket_make_default_value(sock->type); node_socket_copy_default_value(sock->type, sock->default_value, gsock->default_value); - if(lb) + if (lb) BLI_addtail(lb, sock); return sock; @@ -125,42 +125,42 @@ bNode *node_group_make_from_selected(bNodeTree *ntree) INIT_MINMAX2(min, max); /* is there something to group? also do some clearing */ - for(node= ntree->nodes.first; node; node= node->next) { - if(node->flag & NODE_SELECT) { + for (node= ntree->nodes.first; node; node= node->next) { + if (node->flag & NODE_SELECT) { /* no groups in groups */ - if(node->type==NODE_GROUP) + if (node->type==NODE_GROUP) return NULL; DO_MINMAX2( (&node->locx), min, max); totnode++; } node->done= 0; } - if(totnode==0) return NULL; + if (totnode==0) return NULL; /* check if all connections are OK, no unselected node has both inputs and outputs to a selection */ - for(link= ntree->links.first; link; link= link->next) { - if(link->fromnode && link->tonode && link->fromnode->flag & NODE_SELECT) + for (link= ntree->links.first; link; link= link->next) { + if (link->fromnode && link->tonode && link->fromnode->flag & NODE_SELECT) link->tonode->done |= 1; - if(link->fromnode && link->tonode && link->tonode->flag & NODE_SELECT) + if (link->fromnode && link->tonode && link->tonode->flag & NODE_SELECT) link->fromnode->done |= 2; } - for(node= ntree->nodes.first; node; node= node->next) { - if((node->flag & NODE_SELECT)==0) - if(node->done==3) + for (node= ntree->nodes.first; node; node= node->next) { + if ((node->flag & NODE_SELECT)==0) + if (node->done==3) break; } - if(node) + if (node) return NULL; /* OK! new nodetree */ ngroup= ntreeAddTree("NodeGroup", ntree->type, NODE_GROUP); /* move nodes over */ - for(node= ntree->nodes.first; node; node= nextn) { + for (node= ntree->nodes.first; node; node= nextn) { nextn= node->next; - if(node->flag & NODE_SELECT) { + if (node->flag & NODE_SELECT) { /* keep track of this node's RNA "base" path (the part of the pat identifying the node) * if the old nodetree has animation data which potentially covers this node */ @@ -210,20 +210,20 @@ bNode *node_group_make_from_selected(bNodeTree *ntree) gnode->locy= 0.5f*(min[1]+max[1]); /* relink external sockets */ - for(link= ntree->links.first; link; link= linkn) { + for (link= ntree->links.first; link; link= linkn) { linkn= link->next; - if(link->fromnode && link->tonode && (link->fromnode->flag & link->tonode->flag & NODE_SELECT)) { + if (link->fromnode && link->tonode && (link->fromnode->flag & link->tonode->flag & NODE_SELECT)) { BLI_remlink(&ntree->links, link); BLI_addtail(&ngroup->links, link); } - else if(link->tonode && (link->tonode->flag & NODE_SELECT)) { + else if (link->tonode && (link->tonode->flag & NODE_SELECT)) { gsock = node_group_expose_socket(ngroup, link->tosock, SOCK_IN); link->tosock->link = nodeAddLink(ngroup, NULL, gsock, link->tonode, link->tosock); link->tosock = node_group_add_extern_socket(ntree, &gnode->inputs, SOCK_IN, gsock); link->tonode = gnode; } - else if(link->fromnode && (link->fromnode->flag & NODE_SELECT)) { + else if (link->fromnode && (link->fromnode->flag & NODE_SELECT)) { /* search for existing group node socket */ for (gsock=ngroup->outputs.first; gsock; gsock=gsock->next) if (gsock->link && gsock->link->fromsock==link->fromsock) @@ -258,10 +258,10 @@ int node_group_ungroup(bNodeTree *ntree, bNode *gnode) ListBase anim_basepaths = {NULL, NULL}; ngroup= (bNodeTree *)gnode->id; - if(ngroup==NULL) return 0; + if (ngroup==NULL) return 0; /* clear new pointers, set in copytree */ - for(node= ntree->nodes.first; node; node= node->next) + for (node= ntree->nodes.first; node; node= node->next) node->new_node= NULL; /* wgroup is a temporary copy of the NodeTree we're merging in @@ -271,7 +271,7 @@ int node_group_ungroup(bNodeTree *ntree, bNode *gnode) wgroup= ntreeCopyTree(ngroup); /* add the nodes into the ntree */ - for(node= wgroup->nodes.first; node; node= nextn) { + for (node= wgroup->nodes.first; node; node= nextn) { nextn= node->next; /* keep track of this node's RNA "base" path (the part of the pat identifying the node) @@ -299,7 +299,7 @@ int node_group_ungroup(bNodeTree *ntree, bNode *gnode) } /* restore external links to and from the gnode */ - for(link= ntree->links.first; link; link= link->next) { + for (link= ntree->links.first; link; link= link->next) { if (link->fromnode==gnode) { if (link->fromsock->groupsock) { bNodeSocket *gsock= link->fromsock->groupsock; @@ -326,13 +326,13 @@ int node_group_ungroup(bNodeTree *ntree, bNode *gnode) } } /* remove internal output links, these are not used anymore */ - for(link=wgroup->links.first; link; link= linkn) { + for (link=wgroup->links.first; link; link= linkn) { linkn = link->next; if (!link->tonode) nodeRemLink(wgroup, link); } /* restore links from internal nodes */ - for(link= wgroup->links.first; link; link= link->next) { + for (link= wgroup->links.first; link; link= link->next) { /* indicates link to group input */ if (!link->fromnode) { /* NB: can't use find_group_node_input here, @@ -355,7 +355,7 @@ int node_group_ungroup(bNodeTree *ntree, bNode *gnode) } /* add internal links to the ntree */ - for(link= wgroup->links.first; link; link= linkn) { + for (link= wgroup->links.first; link; link= linkn) { linkn= link->next; BLI_remlink(&wgroup->links, link); BLI_addtail(&ntree->links, link); @@ -543,11 +543,11 @@ static bNodeSocket *group_verify_socket(bNodeTree *ntree, ListBase *lb, int in_o if (gsock->flag & SOCK_INTERNAL) return NULL; - for(sock= lb->first; sock; sock= sock->next) { - if(sock->own_index==gsock->own_index) + for (sock= lb->first; sock; sock= sock->next) { + if (sock->own_index==gsock->own_index) break; } - if(sock) { + if (sock) { sock->groupsock = gsock; BLI_strncpy(sock->name, gsock->name, sizeof(sock->name)); @@ -615,7 +615,7 @@ struct bNodeTree *node_group_edit_set(bNode *node, int edit) if (edit) { bNodeTree *ngroup= (bNodeTree*)node->id; if (ngroup) { - if(ngroup->id.lib) + if (ngroup->id.lib) ntreeMakeLocal(ngroup); node->flag |= NODE_GROUP_EDIT; diff --git a/source/blender/nodes/intern/node_exec.c b/source/blender/nodes/intern/node_exec.c index eaf19ad71b6..3b757e753a4 100644 --- a/source/blender/nodes/intern/node_exec.c +++ b/source/blender/nodes/intern/node_exec.c @@ -55,13 +55,13 @@ void node_get_stack(bNode *node, bNodeStack *stack, bNodeStack **in, bNodeStack /* build pointer stack */ if (in) { - for(sock= node->inputs.first; sock; sock= sock->next) { + for (sock= node->inputs.first; sock; sock= sock->next) { *(in++) = node_get_socket_stack(stack, sock); } } if (out) { - for(sock= node->outputs.first; sock; sock= sock->next) { + for (sock= node->outputs.first; sock; sock= sock->next) { *(out++) = node_get_socket_stack(stack, sock); } } @@ -135,7 +135,7 @@ bNodeTreeExec *ntree_exec_begin(bNodeTree *ntree) bNode **nodelist; int totnodes, n; - if((ntree->init & NTREE_TYPE_INIT)==0) + if ((ntree->init & NTREE_TYPE_INIT)==0) ntreeInitTypes(ntree); /* get a dependency-sorted list of nodes */ @@ -147,10 +147,10 @@ bNodeTreeExec *ntree_exec_begin(bNodeTree *ntree) exec->nodetree = ntree; /* group inputs essentially work as outputs */ - for(gsock=ntree->inputs.first; gsock; gsock = gsock->next) + for (gsock=ntree->inputs.first; gsock; gsock = gsock->next) node_init_output_index(gsock, &index); /* set stack indexes */ - for(n=0; n < totnodes; ++n) { + for (n=0; n < totnodes; ++n) { node = nodelist[n]; node->stack_index = index; @@ -162,7 +162,7 @@ bNodeTreeExec *ntree_exec_begin(bNodeTree *ntree) node_init_output_index(sock, &index); } /* group outputs essentially work as inputs */ - for(gsock=ntree->outputs.first; gsock; gsock = gsock->next) + for (gsock=ntree->outputs.first; gsock; gsock = gsock->next) node_init_input_index(gsock, &index); /* allocated exec data pointers for nodes */ @@ -181,13 +181,13 @@ bNodeTreeExec *ntree_exec_begin(bNodeTree *ntree) /* ns = */ setup_stack(exec->stack, sock); } /* prepare all internal nodes for execution */ - for(n=0, nodeexec= exec->nodeexec; n < totnodes; ++n, ++nodeexec) { + for (n=0, nodeexec= exec->nodeexec; n < totnodes; ++n, ++nodeexec) { node = nodeexec->node = nodelist[n]; /* tag inputs */ for (sock=node->inputs.first; sock; sock=sock->next) { /* disable the node if an input link is invalid */ - if(sock->link && !(sock->link->flag & NODE_LINK_VALID)) + if (sock->link && !(sock->link->flag & NODE_LINK_VALID)) node->need_exec= 0; ns = setup_stack(exec->stack, sock); @@ -199,7 +199,7 @@ bNodeTreeExec *ntree_exec_begin(bNodeTree *ntree) /* ns = */ setup_stack(exec->stack, sock); } - if(node->typeinfo->initexecfunc) + if (node->typeinfo->initexecfunc) nodeexec->data = node->typeinfo->initexecfunc(node); } /* prepare group tree outputs */ @@ -222,7 +222,7 @@ void ntree_exec_end(bNodeTreeExec *exec) if (exec->stack) MEM_freeN(exec->stack); - for(n=0, nodeexec= exec->nodeexec; n < exec->totnodes; ++n, ++nodeexec) { + for (n=0, nodeexec= exec->nodeexec; n < exec->totnodes; ++n, ++nodeexec) { if (nodeexec->node->typeinfo->freeexecfunc) nodeexec->node->typeinfo->freeexecfunc(nodeexec->node, nodeexec->data); } @@ -240,8 +240,8 @@ bNodeThreadStack *ntreeGetThreadStack(bNodeTreeExec *exec, int thread) ListBase *lb= &exec->threadstack[thread]; bNodeThreadStack *nts; - for(nts=lb->first; nts; nts=nts->next) { - if(!nts->used) { + for (nts=lb->first; nts; nts=nts->next) { + if (!nts->used) { nts->used= 1; break; } @@ -272,15 +272,15 @@ void ntreeExecNodes(bNodeTreeExec *exec, void *callerdata, int thread) /* nodes are presorted, so exec is in order of list */ - for(n=0, nodeexec= exec->nodeexec; n < exec->totnodes; ++n, ++nodeexec) { + for (n=0, nodeexec= exec->nodeexec; n < exec->totnodes; ++n, ++nodeexec) { node = nodeexec->node; - if(node->need_exec) { + if (node->need_exec) { node_get_stack(node, exec->stack, nsin, nsout); /* Handle muted nodes... * If the mute func is not set, assume the node should never be muted, * and hence execute it! */ - if(node->typeinfo->execfunc) + if (node->typeinfo->execfunc) node->typeinfo->execfunc(callerdata, node, nsin, nsout); else if (node->typeinfo->newexecfunc) node->typeinfo->newexecfunc(callerdata, thread, node, nodeexec->data, nsin, nsout); @@ -298,15 +298,15 @@ void ntreeExecThreadNodes(bNodeTreeExec *exec, bNodeThreadStack *nts, void *call /* nodes are presorted, so exec is in order of list */ - for(n=0, nodeexec= exec->nodeexec; n < exec->totnodes; ++n, ++nodeexec) { + for (n=0, nodeexec= exec->nodeexec; n < exec->totnodes; ++n, ++nodeexec) { node = nodeexec->node; - if(node->need_exec) { + if (node->need_exec) { node_get_stack(node, nts->stack, nsin, nsout); /* Handle muted nodes... * If the mute func is not set, assume the node should never be muted, * and hence execute it! */ - if(node->typeinfo->execfunc) + if (node->typeinfo->execfunc) node->typeinfo->execfunc(callerdata, node, nsin, nsout); else if (node->typeinfo->newexecfunc) node->typeinfo->newexecfunc(callerdata, thread, node, nodeexec->data, nsin, nsout); diff --git a/source/blender/nodes/intern/node_socket.c b/source/blender/nodes/intern/node_socket.c index f03aff8fb92..4e6cf1f9bdd 100644 --- a/source/blender/nodes/intern/node_socket.c +++ b/source/blender/nodes/intern/node_socket.c @@ -485,13 +485,13 @@ static bNodeSocket *verify_socket_template(bNodeTree *ntree, bNode *node, int in { bNodeSocket *sock; - for(sock= socklist->first; sock; sock= sock->next) { - if(!(sock->flag & SOCK_DYNAMIC) && strncmp(sock->name, stemp->name, NODE_MAXSTR)==0) + for (sock= socklist->first; sock; sock= sock->next) { + if (!(sock->flag & SOCK_DYNAMIC) && strncmp(sock->name, stemp->name, NODE_MAXSTR)==0) break; } - if(sock) { + if (sock) { sock->type= stemp->type; /* in future, read this from tydefs! */ - if(stemp->limit==0) sock->limit= 0xFFF; + if (stemp->limit==0) sock->limit= 0xFFF; else sock->limit= stemp->limit; sock->flag |= stemp->flag; @@ -550,7 +550,7 @@ static void verify_socket_template_list(bNodeTree *ntree, bNode *node, int in_ou bNodeSocketTemplate *stemp; /* no inputs anymore? */ - if(stemp_first==NULL) { + if (stemp_first==NULL) { for (sock = (bNodeSocket*)socklist->first; sock; sock=nextsock) { nextsock = sock->next; if (!(sock->flag & SOCK_DYNAMIC)) @@ -560,7 +560,7 @@ static void verify_socket_template_list(bNodeTree *ntree, bNode *node, int in_ou else { /* step by step compare */ stemp= stemp_first; - while(stemp->type != -1) { + while (stemp->type != -1) { stemp->sock= verify_socket_template(ntree, node, in_out, socklist, stemp); stemp++; } @@ -578,14 +578,14 @@ static void verify_socket_template_list(bNodeTree *ntree, bNode *node, int in_ou * so we can add static sockets infront of it. */ sock = socklist->first; - while(stemp->type != -1) { + while (stemp->type != -1) { /* put static sockets infront of dynamic */ BLI_insertlinkbefore(socklist, sock, stemp->sock); stemp++; } } else { - while(stemp->type != -1) { + while (stemp->type != -1) { BLI_addtail(socklist, stemp->sock); stemp++; } @@ -600,7 +600,7 @@ void node_verify_socket_templates(bNodeTree *ntree, bNode *node) * This also prevents group node sockets from being removed, without the need to explicitly * check the node type here. */ - if(ntype && ((ntype->inputs && ntype->inputs[0].type>=0) || (ntype->outputs && ntype->outputs[0].type>=0))) { + if (ntype && ((ntype->inputs && ntype->inputs[0].type>=0) || (ntype->outputs && ntype->outputs[0].type>=0))) { verify_socket_template_list(ntree, node, SOCK_IN, &node->inputs, ntype->inputs); verify_socket_template_list(ntree, node, SOCK_OUT, &node->outputs, ntype->outputs); } diff --git a/source/blender/nodes/intern/node_util.c b/source/blender/nodes/intern/node_util.c index 5967f3c2046..1c38bdf39d7 100644 --- a/source/blender/nodes/intern/node_util.c +++ b/source/blender/nodes/intern/node_util.c @@ -110,7 +110,7 @@ ListBase node_internal_connect_default(bNodeTree *ntree, bNode *node) ret.first = ret.last = NULL; /* Security check! */ - if(!ntree) + if (!ntree) return ret; for (datatype=0; datatype < NUM_SOCKET_TYPES; ++datatype) { -- cgit v1.2.3