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-08-04 16:54:27 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-08-04 16:54:27 +0400
commit97e9659c537359f24a49b5cf9d8dcbb13947cb36 (patch)
tree21da33c8d8757b586fed1e949859a562f3128247 /source/blender/editors/space_node/node_select.c
parente0234cc8214e09f70d86394f4b32d042e7784f29 (diff)
style cleanup
Diffstat (limited to 'source/blender/editors/space_node/node_select.c')
-rw-r--r--source/blender/editors/space_node/node_select.c148
1 files changed, 74 insertions, 74 deletions
diff --git a/source/blender/editors/space_node/node_select.c b/source/blender/editors/space_node/node_select.c
index 1fd50fda462..43676ff572f 100644
--- a/source/blender/editors/space_node/node_select.c
+++ b/source/blender/editors/space_node/node_select.c
@@ -57,7 +57,7 @@ static bNode *node_under_mouse_select(bNodeTree *ntree, int mx, int my)
{
bNode *node;
- for (node=ntree->nodes.last; node; node=node->prev) {
+ for (node = ntree->nodes.last; node; node = node->prev) {
if (node->typeinfo->select_area_func) {
if (node->typeinfo->select_area_func(node, mx, my))
return node;
@@ -70,7 +70,7 @@ static bNode *node_under_mouse_tweak(bNodeTree *ntree, int mx, int my)
{
bNode *node;
- for (node=ntree->nodes.last; node; node=node->prev) {
+ for (node = ntree->nodes.last; node; node = node->prev) {
if (node->typeinfo->tweak_area_func) {
if (node->typeinfo->tweak_area_func(node, mx, my))
return node;
@@ -91,9 +91,9 @@ void node_deselect(bNode *node)
node->flag &= ~SELECT;
/* deselect sockets too */
- for (sock=node->inputs.first; sock; sock=sock->next)
+ for (sock = node->inputs.first; sock; sock = sock->next)
sock->flag &= ~SELECT;
- for (sock=node->outputs.first; sock; sock=sock->next)
+ for (sock = node->outputs.first; sock; sock = sock->next)
sock->flag &= ~SELECT;
}
@@ -119,16 +119,16 @@ void node_socket_deselect(bNode *node, bNodeSocket *sock, int deselect_node)
sock->flag &= ~SELECT;
if (node && deselect_node) {
- int sel=0;
+ int sel = 0;
/* if no selected sockets remain, also deselect the node */
- for (sock=node->inputs.first; sock; sock=sock->next) {
+ for (sock = node->inputs.first; sock; sock = sock->next) {
if (sock->flag & SELECT) {
sel = 1;
break;
}
}
- for (sock=node->outputs.first; sock; sock=sock->next) {
+ for (sock = node->outputs.first; sock; sock = sock->next) {
if (sock->flag & SELECT) {
sel = 1;
break;
@@ -153,7 +153,7 @@ void node_deselect_all(SpaceNode *snode)
{
bNode *node;
- for (node= snode->edittree->nodes.first; node; node= node->next)
+ for (node = snode->edittree->nodes.first; node; node = node->next)
node_deselect(node);
}
@@ -167,15 +167,15 @@ void node_deselect_all_input_sockets(SpaceNode *snode, int deselect_nodes)
* We can do that more efficiently here.
*/
- for (node= snode->edittree->nodes.first; node; node= node->next) {
- int sel=0;
+ for (node = snode->edittree->nodes.first; node; node = node->next) {
+ int sel = 0;
- for (sock= node->inputs.first; sock; sock=sock->next)
+ for (sock = node->inputs.first; sock; sock = sock->next)
sock->flag &= ~SELECT;
/* if no selected sockets remain, also deselect the node */
if (deselect_nodes) {
- for (sock= node->outputs.first; sock; sock=sock->next) {
+ for (sock = node->outputs.first; sock; sock = sock->next) {
if (sock->flag & SELECT) {
sel = 1;
break;
@@ -187,7 +187,7 @@ void node_deselect_all_input_sockets(SpaceNode *snode, int deselect_nodes)
}
}
- for (sock= snode->edittree->outputs.first; sock; sock=sock->next)
+ for (sock = snode->edittree->outputs.first; sock; sock = sock->next)
sock->flag &= ~SELECT;
}
@@ -201,15 +201,15 @@ void node_deselect_all_output_sockets(SpaceNode *snode, int deselect_nodes)
* We can do that more efficiently here.
*/
- for (node= snode->edittree->nodes.first; node; node= node->next) {
- int sel=0;
+ for (node = snode->edittree->nodes.first; node; node = node->next) {
+ int sel = 0;
- for (sock= node->outputs.first; sock; sock=sock->next)
+ for (sock = node->outputs.first; sock; sock = sock->next)
sock->flag &= ~SELECT;
/* if no selected sockets remain, also deselect the node */
if (deselect_nodes) {
- for (sock= node->inputs.first; sock; sock=sock->next) {
+ for (sock = node->inputs.first; sock; sock = sock->next) {
if (sock->flag & SELECT) {
sel = 1;
break;
@@ -221,7 +221,7 @@ void node_deselect_all_output_sockets(SpaceNode *snode, int deselect_nodes)
}
}
- for (sock= snode->edittree->inputs.first; sock; sock=sock->next)
+ for (sock = snode->edittree->inputs.first; sock; sock = sock->next)
sock->flag &= ~SELECT;
}
@@ -232,7 +232,7 @@ int node_select_same_type(SpaceNode *snode)
int redraw;
/* search for the active node. */
- for (nac= snode->edittree->nodes.first; nac; nac= nac->next) {
+ for (nac = snode->edittree->nodes.first; nac; nac = nac->next) {
if (nac->flag & SELECT)
break;
}
@@ -241,16 +241,16 @@ int node_select_same_type(SpaceNode *snode)
if (!nac)
return(0);
- redraw= 0;
- for (p= snode->edittree->nodes.first; p; p= p->next) {
+ redraw = 0;
+ for (p = snode->edittree->nodes.first; p; p = p->next) {
if (p->type != nac->type && p->flag & SELECT) {
/* if it's selected but different type, unselect */
- redraw= 1;
+ redraw = 1;
node_deselect(p);
}
else if (p->type == nac->type && (!(p->flag & SELECT))) {
/* if it's the same type and is not selected, select! */
- redraw= 1;
+ redraw = 1;
node_select(p);
}
}
@@ -265,7 +265,7 @@ int node_select_same_type_np(SpaceNode *snode, int dir)
bNode *nac, *p, *tnode;
/* search the active one. */
- for (nac= snode->edittree->nodes.first; nac; nac= nac->next) {
+ for (nac = snode->edittree->nodes.first; nac; nac = nac->next) {
if (nac->flag & SELECT)
break;
}
@@ -275,9 +275,9 @@ int node_select_same_type_np(SpaceNode *snode, int dir)
return(0);
if (dir == 0)
- p= nac->next;
+ p = nac->next;
else
- p= nac->prev;
+ p = nac->prev;
while (p) {
/* Now search the next with the same type. */
@@ -285,14 +285,14 @@ int node_select_same_type_np(SpaceNode *snode, int dir)
break;
if (dir == 0)
- p= p->next;
+ p = p->next;
else
- p= p->prev;
+ p = p->prev;
}
if (p) {
- for (tnode=snode->edittree->nodes.first; tnode; tnode=tnode->next)
- if (tnode!=p)
+ for (tnode = snode->edittree->nodes.first; tnode; tnode = tnode->next)
+ if (tnode != p)
node_deselect(tnode);
node_select(p);
return(1);
@@ -302,12 +302,12 @@ int node_select_same_type_np(SpaceNode *snode, int dir)
void node_select_single(bContext *C, bNode *node)
{
- Main *bmain= CTX_data_main(C);
- SpaceNode *snode= CTX_wm_space_node(C);
+ Main *bmain = CTX_data_main(C);
+ SpaceNode *snode = CTX_wm_space_node(C);
bNode *tnode;
- for (tnode=snode->edittree->nodes.first; tnode; tnode=tnode->next)
- if (tnode!=node)
+ for (tnode = snode->edittree->nodes.first; tnode; tnode = tnode->next)
+ if (tnode != node)
node_deselect(tnode);
node_select(node);
@@ -315,7 +315,7 @@ void node_select_single(bContext *C, bNode *node)
ED_node_sort(snode->edittree);
- WM_event_add_notifier(C, NC_NODE|NA_SELECTED, NULL);
+ WM_event_add_notifier(C, NC_NODE | NA_SELECTED, NULL);
}
/* ****** Click Select ****** */
@@ -350,7 +350,7 @@ static int node_mouse_select(Main *bmain, SpaceNode *snode, ARegion *ar, const i
* allows selecting outputs from different nodes though.
*/
if (node) {
- for (tsock=node->outputs.first; tsock; tsock=tsock->next)
+ for (tsock = node->outputs.first; tsock; tsock = tsock->next)
node_socket_deselect(node, tsock, 1);
}
node_socket_select(node, sock);
@@ -377,13 +377,13 @@ static int node_mouse_select(Main *bmain, SpaceNode *snode, ARegion *ar, const i
}
}
}
- else { /* extend==0 */
+ else { /* extend==0 */
/* find the closest visible node */
node = node_under_mouse_select(snode->edittree, mx, my);
if (node) {
- for (tnode=snode->edittree->nodes.first; tnode; tnode=tnode->next)
+ for (tnode = snode->edittree->nodes.first; tnode; tnode = tnode->next)
node_deselect(tnode);
node_select(node);
ED_node_set_active(bmain, snode->edittree, node);
@@ -400,9 +400,9 @@ static int node_mouse_select(Main *bmain, SpaceNode *snode, ARegion *ar, const i
static int node_select_exec(bContext *C, wmOperator *op)
{
- Main *bmain= CTX_data_main(C);
- SpaceNode *snode= CTX_wm_space_node(C);
- ARegion *ar= CTX_wm_region(C);
+ Main *bmain = CTX_data_main(C);
+ SpaceNode *snode = CTX_wm_space_node(C);
+ ARegion *ar = CTX_wm_region(C);
int mval[2];
short extend;
@@ -415,14 +415,14 @@ static int node_select_exec(bContext *C, wmOperator *op)
/* perform the select */
if (node_mouse_select(bmain, snode, ar, mval, extend)) {
/* send notifiers */
- WM_event_add_notifier(C, NC_NODE|NA_SELECTED, NULL);
+ WM_event_add_notifier(C, NC_NODE | NA_SELECTED, NULL);
/* allow tweak event to work too */
- return OPERATOR_FINISHED|OPERATOR_PASS_THROUGH;
+ return OPERATOR_FINISHED | OPERATOR_PASS_THROUGH;
}
else {
/* allow tweak event to work too */
- return OPERATOR_CANCELLED|OPERATOR_PASS_THROUGH;
+ return OPERATOR_CANCELLED | OPERATOR_PASS_THROUGH;
}
}
@@ -447,7 +447,7 @@ void NODE_OT_select(wmOperatorType *ot)
ot->poll = ED_operator_node_active;
/* flags */
- ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* properties */
RNA_def_int(ot->srna, "mouse_x", 0, INT_MIN, INT_MAX, "Mouse X", "", INT_MIN, INT_MAX);
@@ -459,13 +459,13 @@ void NODE_OT_select(wmOperatorType *ot)
static int node_borderselect_exec(bContext *C, wmOperator *op)
{
- SpaceNode *snode= CTX_wm_space_node(C);
- ARegion *ar= CTX_wm_region(C);
+ SpaceNode *snode = CTX_wm_space_node(C);
+ ARegion *ar = CTX_wm_region(C);
bNode *node;
rcti rect;
rctf rectf;
- int gesture_mode= RNA_int_get(op->ptr, "gesture_mode");
- int extend= RNA_boolean_get(op->ptr, "extend");
+ int gesture_mode = RNA_int_get(op->ptr, "gesture_mode");
+ int extend = RNA_boolean_get(op->ptr, "extend");
rect.xmin = RNA_int_get(op->ptr, "xmin");
rect.ymin = RNA_int_get(op->ptr, "ymin");
@@ -475,9 +475,9 @@ static int node_borderselect_exec(bContext *C, wmOperator *op)
rect.ymax = RNA_int_get(op->ptr, "ymax");
UI_view2d_region_to_view(&ar->v2d, rect.xmax, rect.ymax, &rectf.xmax, &rectf.ymax);
- for (node= snode->edittree->nodes.first; node; node= node->next) {
+ for (node = snode->edittree->nodes.first; node; node = node->next) {
if (BLI_rctf_isect(&rectf, &node->totr, NULL)) {
- if (gesture_mode==GESTURE_MODAL_SELECT)
+ if (gesture_mode == GESTURE_MODAL_SELECT)
node_select(node);
else
node_deselect(node);
@@ -489,7 +489,7 @@ static int node_borderselect_exec(bContext *C, wmOperator *op)
ED_node_sort(snode->edittree);
- WM_event_add_notifier(C, NC_NODE|NA_SELECTED, NULL);
+ WM_event_add_notifier(C, NC_NODE | NA_SELECTED, NULL);
return OPERATOR_FINISHED;
}
@@ -501,14 +501,14 @@ static int node_border_select_invoke(bContext *C, wmOperator *op, wmEvent *event
if (tweak) {
/* prevent initiating the border select if the mouse is over a node */
/* this allows border select on empty space, but drag-translate on nodes */
- SpaceNode *snode= CTX_wm_space_node(C);
- ARegion *ar= CTX_wm_region(C);
+ SpaceNode *snode = CTX_wm_space_node(C);
+ ARegion *ar = CTX_wm_region(C);
float mx, my;
UI_view2d_region_to_view(&ar->v2d, event->mval[0], event->mval[1], &mx, &my);
if (node_under_mouse_tweak(snode->edittree, mx, my))
- return OPERATOR_CANCELLED|OPERATOR_PASS_THROUGH;
+ return OPERATOR_CANCELLED | OPERATOR_PASS_THROUGH;
}
return WM_border_select_invoke(C, op, event);
@@ -530,7 +530,7 @@ void NODE_OT_select_border(wmOperatorType *ot)
ot->poll = ED_operator_node_active;
/* flags */
- ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* rna */
WM_operator_properties_gesture_border(ot, TRUE);
@@ -569,7 +569,7 @@ static int node_select_all_exec(bContext *C, wmOperator *op)
ED_node_sort(snode->edittree);
- WM_event_add_notifier(C, NC_NODE|NA_SELECTED, NULL);
+ WM_event_add_notifier(C, NC_NODE | NA_SELECTED, NULL);
return OPERATOR_FINISHED;
}
@@ -585,7 +585,7 @@ void NODE_OT_select_all(wmOperatorType *ot)
ot->poll = ED_operator_node_active;
/* flags */
- ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
WM_operator_properties_select_all(ot);
}
@@ -598,22 +598,22 @@ static int node_select_linked_to_exec(bContext *C, wmOperator *UNUSED(op))
bNodeLink *link;
bNode *node;
- for (node=snode->edittree->nodes.first; node; node=node->next)
+ for (node = snode->edittree->nodes.first; node; node = node->next)
node->flag &= ~NODE_TEST;
- for (link=snode->edittree->links.first; link; link=link->next) {
+ for (link = snode->edittree->links.first; link; link = link->next) {
if (link->fromnode && link->tonode && (link->fromnode->flag & NODE_SELECT))
link->tonode->flag |= NODE_TEST;
}
- for (node=snode->edittree->nodes.first; node; node=node->next) {
+ for (node = snode->edittree->nodes.first; node; node = node->next) {
if (node->flag & NODE_TEST)
node_select(node);
}
ED_node_sort(snode->edittree);
- WM_event_add_notifier(C, NC_NODE|NA_SELECTED, NULL);
+ WM_event_add_notifier(C, NC_NODE | NA_SELECTED, NULL);
return OPERATOR_FINISHED;
}
@@ -629,7 +629,7 @@ void NODE_OT_select_linked_to(wmOperatorType *ot)
ot->poll = ED_operator_node_active;
/* flags */
- ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
}
/* ****** Select Linked From ****** */
@@ -640,22 +640,22 @@ static int node_select_linked_from_exec(bContext *C, wmOperator *UNUSED(op))
bNodeLink *link;
bNode *node;
- for (node=snode->edittree->nodes.first; node; node=node->next)
+ for (node = snode->edittree->nodes.first; node; node = node->next)
node->flag &= ~NODE_TEST;
- for (link=snode->edittree->links.first; link; link=link->next) {
+ for (link = snode->edittree->links.first; link; link = link->next) {
if (link->fromnode && link->tonode && (link->tonode->flag & NODE_SELECT))
link->fromnode->flag |= NODE_TEST;
}
- for (node=snode->edittree->nodes.first; node; node=node->next) {
+ for (node = snode->edittree->nodes.first; node; node = node->next) {
if (node->flag & NODE_TEST)
node_select(node);
}
ED_node_sort(snode->edittree);
- WM_event_add_notifier(C, NC_NODE|NA_SELECTED, NULL);
+ WM_event_add_notifier(C, NC_NODE | NA_SELECTED, NULL);
return OPERATOR_FINISHED;
}
@@ -671,7 +671,7 @@ void NODE_OT_select_linked_from(wmOperatorType *ot)
ot->poll = ED_operator_node_active;
/* flags */
- ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
}
/* ****** Select Same Type ****** */
@@ -684,7 +684,7 @@ static int node_select_same_type_exec(bContext *C, wmOperator *UNUSED(op))
ED_node_sort(snode->edittree);
- WM_event_add_notifier(C, NC_NODE|NA_SELECTED, NULL);
+ WM_event_add_notifier(C, NC_NODE | NA_SELECTED, NULL);
return OPERATOR_FINISHED;
}
@@ -700,7 +700,7 @@ void NODE_OT_select_same_type(wmOperatorType *ot)
ot->poll = ED_operator_node_active;
/* flags */
- ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
}
/* ****** Select The Next/Prev Node Of The Same Type ****** */
@@ -713,7 +713,7 @@ static int node_select_same_type_next_exec(bContext *C, wmOperator *UNUSED(op))
ED_node_sort(snode->edittree);
- WM_event_add_notifier(C, NC_NODE|NA_SELECTED, NULL);
+ WM_event_add_notifier(C, NC_NODE | NA_SELECTED, NULL);
return OPERATOR_FINISHED;
}
@@ -730,7 +730,7 @@ void NODE_OT_select_same_type_next(wmOperatorType *ot)
ot->poll = ED_operator_node_active;
/* flags */
- ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
}
static int node_select_same_type_prev_exec(bContext *C, wmOperator *UNUSED(op))
@@ -741,7 +741,7 @@ static int node_select_same_type_prev_exec(bContext *C, wmOperator *UNUSED(op))
ED_node_sort(snode->edittree);
- WM_event_add_notifier(C, NC_NODE|NA_SELECTED, NULL);
+ WM_event_add_notifier(C, NC_NODE | NA_SELECTED, NULL);
return OPERATOR_FINISHED;
}
@@ -757,5 +757,5 @@ void NODE_OT_select_same_type_prev(wmOperatorType *ot)
ot->poll = ED_operator_node_active;
/* flags */
- ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
}