[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57045] trunk/blender/source: style cleanup: nodes
Campbell Barton
ideasman42 at gmail.com
Mon May 27 10:04:08 CEST 2013
Revision: 57045
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57045
Author: campbellbarton
Date: 2013-05-27 08:04:07 +0000 (Mon, 27 May 2013)
Log Message:
-----------
style cleanup: nodes
Modified Paths:
--------------
trunk/blender/source/blender/editors/sculpt_paint/paint_mask.c
trunk/blender/source/blender/imbuf/intern/cineon/cineon_dpx.c
trunk/blender/source/blender/nodes/composite/node_composite_tree.c
trunk/blender/source/blender/nodes/composite/node_composite_util.c
trunk/blender/source/blender/nodes/intern/node_common.c
trunk/blender/source/blender/nodes/intern/node_exec.c
trunk/blender/source/blender/nodes/intern/node_socket.c
trunk/blender/source/blender/nodes/intern/node_util.c
trunk/blender/source/blender/nodes/shader/node_shader_tree.c
trunk/blender/source/blender/nodes/texture/node_texture_tree.c
trunk/blender/source/blender/nodes/texture/node_texture_util.c
trunk/blender/source/tools/uncrustify_clean.sh
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_mask.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_mask.c 2013-05-27 07:57:17 UTC (rev 57044)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_mask.c 2013-05-27 08:04:07 UTC (rev 57045)
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* ***** BEGIN GPL LICENSE BLOCK *****
*
* This program is free software; you can redistribute it and/or
Modified: trunk/blender/source/blender/imbuf/intern/cineon/cineon_dpx.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/cineon/cineon_dpx.c 2013-05-27 07:57:17 UTC (rev 57044)
+++ trunk/blender/source/blender/imbuf/intern/cineon/cineon_dpx.c 2013-05-27 08:04:07 UTC (rev 57045)
@@ -26,7 +26,6 @@
* cineon.c
* contributors: joeedh, Julien Enche
* I hearby donate this code and all rights to the Blender Foundation.
- * $Id$
*/
/** \file blender/imbuf/intern/cineon/cineon_dpx.c
Modified: trunk/blender/source/blender/nodes/composite/node_composite_tree.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/node_composite_tree.c 2013-05-27 07:57:17 UTC (rev 57044)
+++ trunk/blender/source/blender/nodes/composite/node_composite_tree.c 2013-05-27 08:04:07 UTC (rev 57045)
@@ -97,9 +97,9 @@
{
bNodeSocket *sock;
- for (sock= node->outputs.first; sock; sock= sock->next) {
+ for (sock = node->outputs.first; sock; sock = sock->next) {
if (sock->cache) {
- sock->cache= NULL;
+ sock->cache = NULL;
}
}
}
@@ -119,7 +119,7 @@
for (node = ntree->nodes.first; node; node = node->next) {
/* ensure new user input gets handled ok */
- node->need_exec= 0;
+ node->need_exec = 0;
node->new_node->original = node;
/* move over the compbufs */
@@ -128,16 +128,16 @@
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;
+ node->new_node->id = (ID *)node->id;
else
- node->new_node->id= NULL;
+ 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;
+ for (sock = node->outputs.first; sock; sock = sock->next) {
+ sock->new_sock->cache = sock->cache;
+ sock->cache = NULL;
+ sock->new_sock->new_sock = sock;
}
}
@@ -151,8 +151,8 @@
*/
if (node->need_exec) {
bNodeLink *link;
- for (link=localtree->links.first; link; link=link->next)
- if (link->fromnode==node && link->tonode)
+ for (link = localtree->links.first; link; link = link->next)
+ if (link->fromnode == node && link->tonode)
link->tonode->need_exec = 1;
}
@@ -175,7 +175,7 @@
/* move over the compbufs and previews */
BKE_node_preview_merge_tree(ntree, localtree, true);
- for (lnode= localtree->nodes.first; lnode; lnode= lnode->next) {
+ 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)) {
@@ -183,7 +183,7 @@
BKE_image_merge((Image *)lnode->new_node->id, (Image *)lnode->id);
}
}
- else if (lnode->type==CMP_NODE_MOVIEDISTORTION) {
+ 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 */
@@ -191,15 +191,15 @@
if (lnode->new_node->storage)
BKE_tracking_distortion_free(lnode->new_node->storage);
- lnode->new_node->storage= BKE_tracking_distortion_copy(lnode->storage);
+ lnode->new_node->storage = BKE_tracking_distortion_copy(lnode->storage);
}
}
- for (lsock= lnode->outputs.first; lsock; lsock= lsock->next) {
+ 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;
+ lsock->new_sock->cache = lsock->cache;
+ lsock->cache = NULL;
+ lsock->new_sock = NULL;
}
}
}
@@ -227,7 +227,7 @@
tt->type = NTREE_COMPOSIT;
strcpy(tt->idname, "CompositorNodeTree");
strcpy(tt->ui_name, "Compositing");
- tt->ui_icon = 0; /* defined in drawnode.c */
+ tt->ui_icon = 0; /* defined in drawnode.c */
strcpy(tt->ui_description, "");
tt->free_cache = free_cache;
@@ -277,7 +277,7 @@
{
bNodeSocket *sock;
- for (sock= node->outputs.first; sock; sock= sock->next)
+ for (sock = node->outputs.first; sock; sock = sock->next)
sock->flag &= ~SOCK_UNAVAIL;
set_output_visible(node, passflag, RRES_OUT_IMAGE, SCE_PASS_COMBINED);
Modified: trunk/blender/source/blender/nodes/composite/node_composite_util.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/node_composite_util.c 2013-05-27 07:57:17 UTC (rev 57044)
+++ trunk/blender/source/blender/nodes/composite/node_composite_util.c 2013-05-27 08:04:07 UTC (rev 57045)
@@ -34,19 +34,19 @@
int cmp_node_poll_default(bNodeType *UNUSED(ntype), bNodeTree *ntree)
{
- return (strcmp(ntree->idname, "CompositorNodeTree")==0);
+ 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) {
+ for (sock = node->outputs.first; sock; sock = sock->next) {
if (sock->cache) {
//free_compbuf(sock->cache);
//sock->cache= NULL;
}
}
- node->need_exec= 1;
+ node->need_exec = 1;
}
void cmp_node_type_base(bNodeType *ntype, int type, const char *name, short nclass, short flag)
Modified: trunk/blender/source/blender/nodes/intern/node_common.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/node_common.c 2013-05-27 07:57:17 UTC (rev 57044)
+++ trunk/blender/source/blender/nodes/intern/node_common.c 2013-05-27 08:04:07 UTC (rev 57045)
@@ -66,7 +66,7 @@
bNodeSocket *node_group_find_input_socket(bNode *groupnode, const char *identifier)
{
bNodeSocket *sock;
- for (sock=groupnode->inputs.first; sock; sock = sock->next)
+ for (sock = groupnode->inputs.first; sock; sock = sock->next)
if (STREQ(sock->identifier, identifier))
return sock;
return NULL;
@@ -75,7 +75,7 @@
bNodeSocket *node_group_find_output_socket(bNode *groupnode, const char *identifier)
{
bNodeSocket *sock;
- for (sock=groupnode->outputs.first; sock; sock = sock->next)
+ for (sock = groupnode->outputs.first; sock; sock = sock->next)
if (STREQ(sock->identifier, identifier))
return sock;
return NULL;
@@ -90,11 +90,11 @@
int node_group_poll_instance(bNode *node, bNodeTree *nodetree)
{
if (node->typeinfo->poll(node->typeinfo, nodetree)) {
- bNodeTree *grouptree = (bNodeTree*)node->id;
+ bNodeTree *grouptree = (bNodeTree *)node->id;
if (grouptree)
return nodeGroupPoll(nodetree, grouptree);
else
- return TRUE; /* without a linked node tree, group node is always ok */
+ return TRUE; /* without a linked node tree, group node is always ok */
}
else
return FALSE;
@@ -108,7 +108,7 @@
if (nodetree == grouptree)
return 0;
- for (node=grouptree->nodes.first; node; node=node->next) {
+ for (node = grouptree->nodes.first; node; node = node->next) {
if (node->typeinfo->poll_instance && !node->typeinfo->poll_instance(node, nodetree)) {
valid = 0;
break;
@@ -122,7 +122,7 @@
{
bNodeSocket *sock;
- for (sock= verify_lb->first; sock; sock= sock->next) {
+ for (sock = verify_lb->first; sock; sock = sock->next) {
if (STREQ(sock->identifier, iosock->identifier))
break;
}
@@ -178,7 +178,7 @@
{
/* check inputs and outputs, and remove or insert them */
if (id == node->id) {
- bNodeTree *ngroup= (bNodeTree *)node->id;
+ bNodeTree *ngroup = (bNodeTree *)node->id;
group_verify_socket_list(ntree, node, &ngroup->inputs, &node->inputs, SOCK_IN);
group_verify_socket_list(ntree, node, &ngroup->outputs, &node->outputs, SOCK_OUT);
}
@@ -199,13 +199,13 @@
void register_node_type_frame(void)
{
/* frame type is used for all tree types, needs dynamic allocation */
- bNodeType *ntype= MEM_callocN(sizeof(bNodeType), "frame node type");
+ bNodeType *ntype = MEM_callocN(sizeof(bNodeType), "frame node type");
- node_type_base(ntype, NODE_FRAME, "Frame", NODE_CLASS_LAYOUT, NODE_BACKGROUND|NODE_OPTIONS);
+ node_type_base(ntype, NODE_FRAME, "Frame", NODE_CLASS_LAYOUT, NODE_BACKGROUND | NODE_OPTIONS);
node_type_init(ntype, node_frame_init);
node_type_storage(ntype, "NodeFrame", node_free_standard_storage, node_copy_standard_storage);
node_type_size(ntype, 150, 100, 0);
- node_type_compatibility(ntype, NODE_OLD_SHADING|NODE_NEW_SHADING);
+ node_type_compatibility(ntype, NODE_OLD_SHADING | NODE_NEW_SHADING);
ntype->needs_free = 1;
nodeRegisterType(ntype);
@@ -245,7 +245,7 @@
void register_node_type_reroute(void)
{
/* frame type is used for all tree types, needs dynamic allocation */
- bNodeType *ntype= MEM_callocN(sizeof(bNodeType), "frame node type");
+ bNodeType *ntype = MEM_callocN(sizeof(bNodeType), "frame node type");
node_type_base(ntype, NODE_REROUTE, "Reroute", NODE_CLASS_LAYOUT, 0);
node_type_init(ntype, node_reroute_init);
@@ -287,9 +287,9 @@
}
/* determine socket type from unambiguous input/output connection if possible */
- if (input->limit==1 && input->link)
+ if (input->limit == 1 && input->link)
type = input->link->fromsock->type;
- else if (output->limit==1 && output->link)
+ else if (output->limit == 1 && output->link)
type = output->link->tosock->type;
/* arbitrary, could also test output->type, both are the same */
@@ -408,13 +408,13 @@
void register_node_type_group_input(void)
{
/* used for all tree types, needs dynamic allocation */
- bNodeType *ntype= MEM_callocN(sizeof(bNodeType), "node type");
+ bNodeType *ntype = MEM_callocN(sizeof(bNodeType), "node type");
node_type_base(ntype, NODE_GROUP_INPUT, "Group Input", NODE_CLASS_INTERFACE, NODE_OPTIONS);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list