[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49341] trunk/blender/source: style cleanup
Campbell Barton
ideasman42 at gmail.com
Sun Jul 29 02:20:33 CEST 2012
Revision: 49341
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49341
Author: campbellbarton
Date: 2012-07-29 00:20:28 +0000 (Sun, 29 Jul 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/avi/intern/avi.c
trunk/blender/source/blender/blenkernel/intern/multires.c
trunk/blender/source/blender/blenkernel/intern/node.c
trunk/blender/source/blender/blenkernel/intern/ocean.c
trunk/blender/source/blender/blenkernel/intern/writeframeserver.c
trunk/blender/source/blender/blenlib/intern/BLI_args.c
trunk/blender/source/blender/blenlib/intern/DLRB_tree.c
trunk/blender/source/blender/editors/armature/editarmature_retarget.c
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/mesh/editmesh_knife.c
trunk/blender/source/blender/editors/object/object_modifier.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/space_action/space_action.c
trunk/blender/source/blender/editors/space_clip/clip_toolbar.c
trunk/blender/source/blender/editors/space_logic/logic_ops.c
trunk/blender/source/blender/makesdna/intern/makesdna.c
trunk/blender/source/blender/makesrna/intern/rna_access.c
trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
trunk/blender/source/blender/render/intern/source/render_texture.c
trunk/blender/source/blender/render/intern/source/shadbuf.c
trunk/blender/source/blender/render/intern/source/sss.c
trunk/blender/source/gameengine/GamePlayer/xembed/UnixShell.c
trunk/blender/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c
Modified: trunk/blender/source/blender/avi/intern/avi.c
===================================================================
--- trunk/blender/source/blender/avi/intern/avi.c 2012-07-28 23:11:35 UTC (rev 49340)
+++ trunk/blender/source/blender/avi/intern/avi.c 2012-07-29 00:20:28 UTC (rev 49341)
@@ -857,9 +857,9 @@
#if 0
if (movie->streams[i].format == AVI_FORMAT_MJPEG) {
AviMJPEGUnknown *tmp;
-
- tmp = (AviMJPEGUnknown *) ((char*) movie->streams[i].sf +sizeof(AviBitmapInfoHeader));
-
+
+ tmp = (AviMJPEGUnknown *)((char *) movie->streams[i].sf + sizeof(AviBitmapInfoHeader));
+
tmp->a = 44;
tmp->b = 24;
tmp->c = 0;
Modified: trunk/blender/source/blender/blenkernel/intern/multires.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/multires.c 2012-07-28 23:11:35 UTC (rev 49340)
+++ trunk/blender/source/blender/blenkernel/intern/multires.c 2012-07-29 00:20:28 UTC (rev 49341)
@@ -1311,7 +1311,7 @@
memcpy(subGridData[i], gridData[i], key.elem_size * gridSize * gridSize);
}
- /*numGrids = ccgdm->dm->getNumGrids((DerivedMesh*)ccgdm);*/ /*UNUSED*/
+ /* numGrids = ccgdm->dm->getNumGrids((DerivedMesh *)ccgdm); */ /*UNUSED*/
gridSize = ccgdm->getGridSize((DerivedMesh *)ccgdm);
gridData = ccgdm->getGridData((DerivedMesh *)ccgdm);
gridOffset = ccgdm->getGridOffset((DerivedMesh *)ccgdm);
Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c 2012-07-28 23:11:35 UTC (rev 49340)
+++ trunk/blender/source/blender/blenkernel/intern/node.c 2012-07-29 00:20:28 UTC (rev 49341)
@@ -91,8 +91,8 @@
static bNodeType *node_get_type(bNodeTree *ntree, int type)
{
bNodeType *ntype = ntreeGetType(ntree->type)->node_types.first;
- for (; ntype; ntype= ntype->next)
- if (ntype->type==type)
+ for (; ntype; ntype = ntype->next)
+ if (ntype->type == type)
return ntype;
return NULL;
@@ -105,12 +105,12 @@
bNodeSocketType *ntreeGetSocketType(int type)
{
- static bNodeSocketType *types[NUM_SOCKET_TYPES]= {NULL};
+ static bNodeSocketType *types[NUM_SOCKET_TYPES] = {NULL};
static int types_init = 1;
if (types_init) {
node_socket_type_init(types);
- types_init= 0;
+ types_init = 0;
}
if (type < NUM_SOCKET_TYPES) {
@@ -125,8 +125,8 @@
{
bNode *node, *next;
- for (node= ntree->nodes.first; node; node= next) {
- next= node->next;
+ for (node = ntree->nodes.first; node; node = next) {
+ next = node->next;
node->typeinfo = node_get_type(ntree, node->type);
@@ -143,11 +143,11 @@
{
bNodeSocket *sock;
- sock= MEM_callocN(sizeof(bNodeSocket), "sock");
+ sock = MEM_callocN(sizeof(bNodeSocket), "sock");
BLI_strncpy(sock->name, name, NODE_MAXSTR);
- sock->limit = (in_out==SOCK_IN ? 1 : 0xFFF);
- sock->type= type;
+ sock->limit = (in_out == SOCK_IN ? 1 : 0xFFF);
+ sock->type = type;
sock->storage = NULL;
sock->default_value = node_socket_make_default_value(type);
@@ -159,9 +159,9 @@
bNodeSocket *nodeAddSocket(bNodeTree *ntree, bNode *node, int in_out, const char *name, int type)
{
bNodeSocket *sock = make_socket(ntree, in_out, name, type);
- if (in_out==SOCK_IN)
+ if (in_out == SOCK_IN)
BLI_addtail(&node->inputs, sock);
- else if (in_out==SOCK_OUT)
+ else if (in_out == SOCK_OUT)
BLI_addtail(&node->outputs, sock);
node->update |= NODE_UPDATE;
@@ -172,9 +172,9 @@
bNodeSocket *nodeInsertSocket(bNodeTree *ntree, bNode *node, int in_out, bNodeSocket *next_sock, const char *name, int type)
{
bNodeSocket *sock = make_socket(ntree, in_out, name, type);
- if (in_out==SOCK_IN)
+ if (in_out == SOCK_IN)
BLI_insertlinkbefore(&node->inputs, next_sock, sock);
- else if (in_out==SOCK_OUT)
+ else if (in_out == SOCK_OUT)
BLI_insertlinkbefore(&node->outputs, next_sock, sock);
node->update |= NODE_UPDATE;
@@ -186,9 +186,9 @@
{
bNodeLink *link, *next;
- for (link= ntree->links.first; link; link= next) {
- next= link->next;
- if (link->fromsock==sock || link->tosock==sock) {
+ for (link = ntree->links.first; link; link = next) {
+ next = link->next;
+ if (link->fromsock == sock || link->tosock == sock) {
nodeRemLink(ntree, link);
}
}
@@ -208,17 +208,17 @@
bNodeSocket *sock;
bNodeLink *link, *next;
- for (link= ntree->links.first; link; link= next) {
- next= link->next;
- if (link->fromnode==node || link->tonode==node) {
+ for (link = ntree->links.first; link; link = next) {
+ next = link->next;
+ if (link->fromnode == node || link->tonode == node) {
nodeRemLink(ntree, link);
}
}
- for (sock=node->inputs.first; sock; sock=sock->next)
+ for (sock = node->inputs.first; sock; sock = sock->next)
node_socket_free_default_value(sock->type, sock->default_value);
BLI_freelistN(&node->inputs);
- for (sock=node->outputs.first; sock; sock=sock->next)
+ for (sock = node->outputs.first; sock; sock = sock->next)
node_socket_free_default_value(sock->type, sock->default_value);
BLI_freelistN(&node->outputs);
@@ -236,20 +236,20 @@
{
bNode *node;
bNodeSocket *tsock;
- int index= 0;
+ int index = 0;
- for (node= ntree->nodes.first; node; node= node->next) {
- for (index=0, tsock= node->inputs.first; tsock; tsock= tsock->next, index++) {
- if (tsock==sock) {
- if (in_out) *in_out= SOCK_IN;
+ for (node = ntree->nodes.first; node; node = node->next) {
+ for (index = 0, tsock = node->inputs.first; tsock; tsock = tsock->next, index++) {
+ if (tsock == sock) {
+ if (in_out) *in_out = SOCK_IN;
break;
}
}
if (tsock)
break;
- for (index=0, tsock= node->outputs.first; tsock; tsock= tsock->next, index++) {
- if (tsock==sock) {
- if (in_out) *in_out= SOCK_OUT;
+ for (index = 0, tsock = node->outputs.first; tsock; tsock = tsock->next, index++) {
+ if (tsock == sock) {
+ if (in_out) *in_out = SOCK_OUT;
break;
}
}
@@ -258,12 +258,12 @@
}
if (node) {
- *nodep= node;
- if (sockindex) *sockindex= index;
+ *nodep = node;
+ if (sockindex) *sockindex = index;
return 1;
}
- *nodep= NULL;
+ *nodep = NULL;
return 0;
}
@@ -274,7 +274,7 @@
/* bNodeSocket *sock; */ /* UNUSED */
if (ntype->inputs) {
- sockdef= ntype->inputs;
+ sockdef = ntype->inputs;
while (sockdef->type != -1) {
/* sock = */ node_add_input_from_template(ntree, node, sockdef);
@@ -282,7 +282,7 @@
}
}
if (ntype->outputs) {
- sockdef= ntype->outputs;
+ sockdef = ntype->outputs;
while (sockdef->type != -1) {
/* sock = */ node_add_output_from_template(ntree, node, sockdef);
@@ -302,7 +302,7 @@
bNode *node;
bNodeType *ntype;
- ntype= node_get_type(ntree, ntemp->type);
+ ntype = node_get_type(ntree, ntemp->type);
if (ntype == NULL) {
printf("nodeAddNodeType() error: '%d' type invalid\n", ntemp->type);
return NULL;
@@ -311,20 +311,20 @@
if (!nodeValid(ntree, ntemp))
return NULL;
- node= MEM_callocN(sizeof(bNode), "new node");
- node->type= ntype->type;
- node->typeinfo= ntype;
- node->flag= NODE_SELECT|ntype->flag;
- node->width= ntype->width;
- node->miniwidth= 42.0f;
- node->height= ntype->height;
- node->color[0] = node->color[1] = node->color[2] = 0.608; /* default theme color */
+ node = MEM_callocN(sizeof(bNode), "new node");
+ node->type = ntype->type;
+ node->typeinfo = ntype;
+ node->flag = NODE_SELECT | ntype->flag;
+ node->width = ntype->width;
+ node->miniwidth = 42.0f;
+ node->height = ntype->height;
+ node->color[0] = node->color[1] = node->color[2] = 0.608; /* default theme color */
node_add_sockets_from_type(ntree, node, ntype);
BLI_addtail(&ntree->nodes, node);
- if (ntype->initfunc!=NULL)
+ if (ntype->initfunc != NULL)
ntype->initfunc(ntree, node, ntemp);
/* initialize the node name with the node label.
@@ -343,19 +343,19 @@
/* ntree is the target tree */
bNode *nodeCopyNode(struct bNodeTree *ntree, struct bNode *node)
{
- bNode *nnode= MEM_callocN(sizeof(bNode), "dupli node");
+ bNode *nnode = MEM_callocN(sizeof(bNode), "dupli node");
bNodeSocket *sock, *oldsock;
- *nnode= *node;
+ *nnode = *node;
nodeUniqueName(ntree, nnode);
BLI_addtail(&ntree->nodes, nnode);
BLI_duplicatelist(&nnode->inputs, &node->inputs);
- oldsock= node->inputs.first;
- for (sock= nnode->inputs.first; sock; sock= sock->next, oldsock= oldsock->next) {
- oldsock->new_sock= sock;
- sock->stack_index= 0;
+ oldsock = node->inputs.first;
+ for (sock = nnode->inputs.first; sock; sock = sock->next, oldsock = oldsock->next) {
+ oldsock->new_sock = sock;
+ sock->stack_index = 0;
sock->default_value = node_socket_make_default_value(oldsock->type);
node_socket_copy_default_value(oldsock->type, sock->default_value, oldsock->default_value);
@@ -367,10 +367,10 @@
}
BLI_duplicatelist(&nnode->outputs, &node->outputs);
- oldsock= node->outputs.first;
- for (sock= nnode->outputs.first; sock; sock= sock->next, oldsock= oldsock->next) {
- oldsock->new_sock= sock;
- sock->stack_index= 0;
+ oldsock = node->outputs.first;
+ for (sock = nnode->outputs.first; sock; sock = sock->next, oldsock = oldsock->next) {
+ oldsock->new_sock = sock;
+ sock->stack_index = 0;
sock->default_value = node_socket_make_default_value(oldsock->type);
node_socket_copy_default_value(oldsock->type, sock->default_value, oldsock->default_value);
@@ -386,9 +386,9 @@
if (node->typeinfo->copystoragefunc)
node->typeinfo->copystoragefunc(node, nnode);
- node->new_node= nnode;
- nnode->new_node= NULL;
- nnode->preview= NULL;
+ node->new_node = nnode;
+ nnode->new_node = NULL;
+ nnode->preview = NULL;
ntree->update |= NTREE_UPDATE_NODES;
@@ -399,84 +399,84 @@
bNodeLink *nodeAddLink(bNodeTree *ntree, bNode *fromnode, bNodeSocket *fromsock, bNode *tonode, bNodeSocket *tosock)
{
bNodeSocket *sock;
- bNodeLink *link= NULL;
- int from= 0, to= 0;
+ bNodeLink *link = NULL;
+ int from = 0, to = 0;
if (fromnode) {
/* test valid input */
- for (sock= fromnode->outputs.first; sock; sock= sock->next)
- if (sock==fromsock)
+ for (sock = fromnode->outputs.first; sock; sock = sock->next)
+ if (sock == fromsock)
break;
if (sock)
- from= 1; /* OK */
+ from = 1; /* OK */
else {
- for (sock= fromnode->inputs.first; sock; sock= sock->next)
- if (sock==fromsock)
+ for (sock = fromnode->inputs.first; sock; sock = sock->next)
+ if (sock == fromsock)
break;
if (sock)
- from= -1; /* OK but flip */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list