Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-05-23 02:03:41 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-05-23 02:03:41 +0400
commitdab1d8e4874564f182d7b73b603f66a4f34565ad (patch)
treee79733e7f9091b5a5840af54062f8e7bcb770f8b /source/blender/nodes
parentd2a37d464a81959eb3409115f320c83af4398934 (diff)
style cleanup
Diffstat (limited to 'source/blender/nodes')
-rw-r--r--source/blender/nodes/composite/node_composite_tree.c30
-rw-r--r--source/blender/nodes/intern/node_common.c2
2 files changed, 16 insertions, 16 deletions
diff --git a/source/blender/nodes/composite/node_composite_tree.c b/source/blender/nodes/composite/node_composite_tree.c
index b266af15060..8099f6d3f13 100644
--- a/source/blender/nodes/composite/node_composite_tree.c
+++ b/source/blender/nodes/composite/node_composite_tree.c
@@ -586,9 +586,9 @@ static void ntreeCompositExecTreeOld(bNodeTree *ntree, RenderData *rd, int do_pr
int totnode, curnode, rendering= 1, n;
bNodeTreeExec *exec= ntree->execdata;
- if(ntree==NULL) return;
+ if (ntree == NULL) return;
- if(do_preview)
+ if (do_preview)
ntreeInitPreview(ntree, 0, 0);
if (!ntree->execdata) {
@@ -598,7 +598,7 @@ static void ntreeCompositExecTreeOld(bNodeTree *ntree, RenderData *rd, int do_pr
ntree_composite_texnode(ntree, 1);
/* prevent unlucky accidents */
- if(G.background)
+ if (G.background)
rd->scemode &= ~R_COMP_CROP;
/* setup callerdata for thread callback */
@@ -613,15 +613,15 @@ static void ntreeCompositExecTreeOld(bNodeTree *ntree, RenderData *rd, int do_pr
BLI_init_threads(&threads, exec_composite_node, rd->threads);
- while(rendering) {
+ while (rendering) {
- if(BLI_available_threads(&threads)) {
+ if (BLI_available_threads(&threads)) {
nodeexec= getExecutableNode(exec);
- if(nodeexec) {
+ if (nodeexec) {
node = nodeexec->node;
- if(ntree->progress && totnode)
+ if (ntree->progress && totnode)
ntree->progress(ntree->prh, (1.0f - curnode/(float)totnode));
- if(ntree->stats_draw) {
+ if (ntree->stats_draw) {
char str[128];
BLI_snprintf(str, sizeof(str), "Compositing %d %s", curnode, node->name);
ntree->stats_draw(ntree->sdh, str);
@@ -640,21 +640,21 @@ static void ntreeCompositExecTreeOld(bNodeTree *ntree, RenderData *rd, int do_pr
rendering= 0;
/* test for ESC */
- if(ntree->test_break && ntree->test_break(ntree->tbh)) {
- for(node= ntree->nodes.first; node; node= node->next)
+ if (ntree->test_break && ntree->test_break(ntree->tbh)) {
+ for (node= ntree->nodes.first; node; node= node->next)
node->exec |= NODE_READY;
}
/* check for ready ones, and if we need to continue */
- 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->exec & NODE_READY) {
- if((node->exec & NODE_FINISHED)==0) {
+ if (node->exec & NODE_READY) {
+ if ((node->exec & NODE_FINISHED)==0) {
BLI_remove_thread(&threads, nodeexec); /* this waits for running thread to finish btw */
node->exec |= NODE_FINISHED;
/* freeing unused buffers */
- if(rd->scemode & R_COMP_FREE)
+ if (rd->scemode & R_COMP_FREE)
freeExecutableNode(exec);
}
}
@@ -670,7 +670,7 @@ static void ntreeCompositExecTreeOld(bNodeTree *ntree, RenderData *rd, int do_pr
void ntreeCompositExecTree(bNodeTree *ntree, RenderData *rd, int rendering, int do_preview)
{
- if(G.rt == 200)
+ if (G.rt == 200)
ntreeCompositExecTreeOld(ntree, rd, do_preview);
else
COM_execute(ntree, rendering);
diff --git a/source/blender/nodes/intern/node_common.c b/source/blender/nodes/intern/node_common.c
index 21aad779f89..fa1af821a2d 100644
--- a/source/blender/nodes/intern/node_common.c
+++ b/source/blender/nodes/intern/node_common.c
@@ -552,7 +552,7 @@ static bNodeSocket *group_verify_socket(bNodeTree *ntree, ListBase *lb, int in_o
sock->groupsock = gsock;
BLI_strncpy(sock->name, gsock->name, sizeof(sock->name));
- if(gsock->type != sock->type)
+ if (gsock->type != sock->type)
nodeSocketSetType(sock, gsock->type);
/* XXX hack: group socket input/output roles are inverted internally,