[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48165] trunk/blender/source/blender/ editors/space_node/node_edit.c: style cleanup
Campbell Barton
ideasman42 at gmail.com
Thu Jun 21 15:19:28 CEST 2012
Revision: 48165
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48165
Author: campbellbarton
Date: 2012-06-21 13:19:19 +0000 (Thu, 21 Jun 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_node/node_edit.c
Modified: trunk/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_edit.c 2012-06-21 13:02:48 UTC (rev 48164)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c 2012-06-21 13:19:19 UTC (rev 48165)
@@ -120,7 +120,7 @@
/* called by compo, only to check job 'stop' value */
static int compo_breakjob(void *cjv)
{
- CompoJob *cj= cjv;
+ CompoJob *cj = cjv;
return *(cj->stop);
}
@@ -128,14 +128,14 @@
/* called by compo, wmJob sends notifier */
static void compo_redrawjob(void *cjv, char *UNUSED(str))
{
- CompoJob *cj= cjv;
+ CompoJob *cj = cjv;
*(cj->do_update) = TRUE;
}
static void compo_freejob(void *cjv)
{
- CompoJob *cj= cjv;
+ CompoJob *cj = cjv;
if (cj->localtree) {
ntreeLocalMerge(cj->localtree, cj->ntree);
@@ -147,22 +147,22 @@
* sliding buttons doesn't frustrate */
static void compo_initjob(void *cjv)
{
- CompoJob *cj= cjv;
+ CompoJob *cj = cjv;
- cj->localtree= ntreeLocalize(cj->ntree);
+ cj->localtree = ntreeLocalize(cj->ntree);
}
/* called before redraw notifiers, it moves finished previews over */
static void compo_updatejob(void *cjv)
{
- CompoJob *cj= cjv;
+ CompoJob *cj = cjv;
ntreeLocalSync(cj->localtree, cj->ntree);
}
static void compo_progressjob(void *cjv, float progress)
{
- CompoJob *cj= cjv;
+ CompoJob *cj = cjv;
*(cj->progress) = progress;
}
@@ -171,49 +171,49 @@
/* only this runs inside thread */
static void compo_startjob(void *cjv, short *stop, short *do_update, float *progress)
{
- CompoJob *cj= cjv;
- bNodeTree *ntree= cj->localtree;
+ CompoJob *cj = cjv;
+ bNodeTree *ntree = cj->localtree;
if (cj->scene->use_nodes == FALSE)
return;
- cj->stop= stop;
- cj->do_update= do_update;
- cj->progress= progress;
+ cj->stop = stop;
+ cj->do_update = do_update;
+ cj->progress = progress;
+
+ ntree->test_break = compo_breakjob;
+ ntree->tbh = cj;
+ ntree->stats_draw = compo_redrawjob;
+ ntree->sdh = cj;
+ ntree->progress = compo_progressjob;
+ ntree->prh = cj;
- ntree->test_break= compo_breakjob;
- ntree->tbh= cj;
- ntree->stats_draw= compo_redrawjob;
- ntree->sdh= cj;
- ntree->progress= compo_progressjob;
- ntree->prh= cj;
-
// XXX BIF_store_spare();
- ntreeCompositExecTree(ntree, &cj->scene->r, 0, 1); /* 1 is do_previews */
+ ntreeCompositExecTree(ntree, &cj->scene->r, 0, 1); /* 1 is do_previews */
- ntree->test_break= NULL;
- ntree->stats_draw= NULL;
- ntree->progress= NULL;
+ ntree->test_break = NULL;
+ ntree->stats_draw = NULL;
+ ntree->progress = NULL;
}
void snode_composite_job(const bContext *C, ScrArea *sa)
{
- SpaceNode *snode= sa->spacedata.first;
+ SpaceNode *snode = sa->spacedata.first;
wmJob *steve;
CompoJob *cj;
- steve= WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), sa, "Compositing", WM_JOB_EXCL_RENDER|WM_JOB_PROGRESS);
- cj= MEM_callocN(sizeof(CompoJob), "compo job");
+ steve = WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), sa, "Compositing", WM_JOB_EXCL_RENDER | WM_JOB_PROGRESS);
+ cj = MEM_callocN(sizeof(CompoJob), "compo job");
/* customdata for preview thread */
- cj->scene= CTX_data_scene(C);
- cj->ntree= snode->nodetree;
+ cj->scene = CTX_data_scene(C);
+ cj->ntree = snode->nodetree;
/* setup job */
WM_jobs_customdata(steve, cj, compo_freejob);
- WM_jobs_timer(steve, 0.1, NC_SCENE, NC_SCENE|ND_COMPO_RESULT);
+ WM_jobs_timer(steve, 0.1, NC_SCENE, NC_SCENE | ND_COMPO_RESULT);
WM_jobs_callbacks(steve, compo_startjob, compo_initjob, compo_updatejob, NULL);
WM_jobs_start(CTX_wm_manager(C), steve);
@@ -225,9 +225,9 @@
/* operator poll callback */
static int composite_node_active(bContext *C)
{
- if ( ED_operator_node_active(C)) {
- SpaceNode *snode= CTX_wm_space_node(C);
- if (snode->treetype==NTREE_COMPOSIT)
+ if (ED_operator_node_active(C)) {
+ SpaceNode *snode = CTX_wm_space_node(C);
+ if (snode->treetype == NTREE_COMPOSIT)
return 1;
}
return 0;
@@ -239,7 +239,7 @@
bNode *node;
/* check for edited group */
- for (node= ntree->nodes.first; node; node= node->next)
+ for (node = ntree->nodes.first; node; node = node->next)
if (nodeGroupEditGet(node))
break;
if (node)
@@ -255,9 +255,9 @@
if (ntree == lookup)
return 1;
- for (node=ntree->nodes.first; node; node=node->next)
+ for (node = ntree->nodes.first; node; node = node->next)
if (node->type == NODE_GROUP && node->id)
- if (has_nodetree((bNodeTree*)node->id, lookup))
+ if (has_nodetree((bNodeTree *)node->id, lookup))
return 1;
return 0;
@@ -274,8 +274,8 @@
Main *bmain = CTX_data_main(C);
/* for groups, update all ID's using this */
- if (snode->edittree!=snode->nodetree) {
- bNodeTreeType *tti= ntreeGetType(snode->edittree->type);
+ if (snode->edittree != snode->nodetree) {
+ bNodeTreeType *tti = ntreeGetType(snode->edittree->type);
tti->foreach_nodetree(bmain, snode->edittree, snode_dag_update_group);
}
@@ -284,14 +284,14 @@
void snode_notify(bContext *C, SpaceNode *snode)
{
- WM_event_add_notifier(C, NC_NODE|NA_EDITED, NULL);
+ WM_event_add_notifier(C, NC_NODE | NA_EDITED, NULL);
- if (snode->treetype==NTREE_SHADER)
- WM_event_add_notifier(C, NC_MATERIAL|ND_NODES, snode->id);
- else if (snode->treetype==NTREE_COMPOSIT)
- WM_event_add_notifier(C, NC_SCENE|ND_NODES, snode->id);
- else if (snode->treetype==NTREE_TEXTURE)
- WM_event_add_notifier(C, NC_TEXTURE|ND_NODES, snode->id);
+ if (snode->treetype == NTREE_SHADER)
+ WM_event_add_notifier(C, NC_MATERIAL | ND_NODES, snode->id);
+ else if (snode->treetype == NTREE_COMPOSIT)
+ WM_event_add_notifier(C, NC_SCENE | ND_NODES, snode->id);
+ else if (snode->treetype == NTREE_TEXTURE)
+ WM_event_add_notifier(C, NC_TEXTURE | ND_NODES, snode->id);
}
bNode *node_tree_get_editgroup(bNodeTree *nodetree)
@@ -299,7 +299,7 @@
bNode *gnode;
/* get the groupnode */
- for (gnode= nodetree->nodes.first; gnode; gnode= gnode->next)
+ for (gnode = nodetree->nodes.first; gnode; gnode = gnode->next)
if (nodeGroupEditGet(gnode))
break;
return gnode;
@@ -316,11 +316,11 @@
int output_type, shader_type;
float color[3], strength = 1.0f;
- ntree= ntreeAddTree("Shader Nodetree", NTREE_SHADER, 0);
+ ntree = ntreeAddTree("Shader Nodetree", NTREE_SHADER, 0);
switch (GS(id->name)) {
case ID_MA: {
- Material *ma= (Material*)id;
+ Material *ma = (Material *)id;
ma->nodetree = ntree;
if (BKE_scene_use_new_shading_nodes(scene)) {
@@ -333,22 +333,22 @@
}
copy_v3_v3(color, &ma->r);
- strength= 0.0f;
+ strength = 0.0f;
break;
}
case ID_WO: {
- World *wo= (World*)id;
+ World *wo = (World *)id;
wo->nodetree = ntree;
output_type = SH_NODE_OUTPUT_WORLD;
shader_type = SH_NODE_BACKGROUND;
copy_v3_v3(color, &wo->horr);
- strength= 1.0f;
+ strength = 1.0f;
break;
}
case ID_LA: {
- Lamp *la= (Lamp*)id;
+ Lamp *la = (Lamp *)id;
la->nodetree = ntree;
output_type = SH_NODE_OUTPUT_LAMP;
@@ -356,9 +356,9 @@
copy_v3_v3(color, &la->r);
if (la->type == LA_LOCAL || la->type == LA_SPOT || la->type == LA_AREA)
- strength= 100.0f;
+ strength = 100.0f;
else
- strength= 1.0f;
+ strength = 1.0f;
break;
}
default:
@@ -367,27 +367,27 @@
}
ntemp.type = output_type;
- out= nodeAddNode(ntree, &ntemp);
- out->locx= 300.0f; out->locy= 300.0f;
+ out = nodeAddNode(ntree, &ntemp);
+ out->locx = 300.0f; out->locy = 300.0f;
ntemp.type = shader_type;
- in= nodeAddNode(ntree, &ntemp);
- in->locx= 10.0f; in->locy= 300.0f;
+ in = nodeAddNode(ntree, &ntemp);
+ in->locx = 10.0f; in->locy = 300.0f;
nodeSetActive(ntree, in);
/* only a link from color to color */
- fromsock= in->outputs.first;
- tosock= out->inputs.first;
+ fromsock = in->outputs.first;
+ tosock = out->inputs.first;
nodeAddLink(ntree, in, fromsock, out, tosock);
/* default values */
if (BKE_scene_use_new_shading_nodes(scene)) {
- sock= in->inputs.first;
- copy_v3_v3(((bNodeSocketValueRGBA*)sock->default_value)->value, color);
+ sock = in->inputs.first;
+ copy_v3_v3(((bNodeSocketValueRGBA *)sock->default_value)->value, color);
if (strength != 0.0f) {
- sock= in->inputs.last;
- ((bNodeSocketValueFloat*)sock->default_value)->value= strength;
+ sock = in->inputs.last;
+ ((bNodeSocketValueFloat *)sock->default_value)->value = strength;
}
}
@@ -409,28 +409,28 @@
return;
}
- sce->nodetree= ntreeAddTree("Compositing Nodetree", NTREE_COMPOSIT, 0);
+ sce->nodetree = ntreeAddTree("Compositing Nodetree", NTREE_COMPOSIT, 0);
sce->nodetree->chunksize = 256;
sce->nodetree->edit_quality = NTREE_QUALITY_HIGH;
sce->nodetree->render_quality = NTREE_QUALITY_HIGH;
ntemp.type = CMP_NODE_COMPOSITE;
- out= nodeAddNode(sce->nodetree, &ntemp);
- out->locx= 300.0f; out->locy= 400.0f;
- out->id= &sce->id;
+ out = nodeAddNode(sce->nodetree, &ntemp);
+ out->locx = 300.0f; out->locy = 400.0f;
+ out->id = &sce->id;
id_us_plus(out->id);
ntemp.type = CMP_NODE_R_LAYERS;
- in= nodeAddNode(sce->nodetree, &ntemp);
- in->locx= 10.0f; in->locy= 400.0f;
- in->id= &sce->id;
+ in = nodeAddNode(sce->nodetree, &ntemp);
+ in->locx = 10.0f; in->locy = 400.0f;
+ in->id = &sce->id;
id_us_plus(in->id);
nodeSetActive(sce->nodetree, in);
/* links from color to color */
- fromsock= in->outputs.first;
- tosock= out->inputs.first;
+ fromsock = in->outputs.first;
+ tosock = out->inputs.first;
nodeAddLink(sce->nodetree, in, fromsock, out, tosock);
ntreeUpdateTree(sce->nodetree);
@@ -453,19 +453,19 @@
return;
}
- tx->nodetree= ntreeAddTree("Texture Nodetree", NTREE_TEXTURE, 0);
+ tx->nodetree = ntreeAddTree("Texture Nodetree", NTREE_TEXTURE, 0);
ntemp.type = TEX_NODE_OUTPUT;
- out= nodeAddNode(tx->nodetree, &ntemp);
- out->locx= 300.0f; out->locy= 300.0f;
+ out = nodeAddNode(tx->nodetree, &ntemp);
+ out->locx = 300.0f; out->locy = 300.0f;
ntemp.type = TEX_NODE_CHECKER;
- in= nodeAddNode(tx->nodetree, &ntemp);
- in->locx= 10.0f; in->locy= 300.0f;
+ in = nodeAddNode(tx->nodetree, &ntemp);
+ in->locx = 10.0f; in->locy = 300.0f;
nodeSetActive(tx->nodetree, in);
- fromsock= in->outputs.first;
- tosock= out->inputs.first;
+ fromsock = in->outputs.first;
+ tosock = out->inputs.first;
nodeAddLink(tx->nodetree, in, fromsock, out, tosock);
ntreeUpdateTree(tx->nodetree);
@@ -475,128 +475,128 @@
void node_tree_from_ID(ID *id, bNodeTree **ntree, bNodeTree **edittree, int *treetype)
{
if (id) {
- bNode *node= NULL;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list