diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-24 06:51:46 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-24 06:51:46 +0400 |
commit | 2f348d8b5d7d897ad44d192a2fd5f2b99b906c76 (patch) | |
tree | 1b2612031fd1cb0e521c2e0e444e7b0bd2b77646 /source/blender/editors/space_node | |
parent | d6fd5266d0514e6d31fd0e11aab5322846d78589 (diff) |
style cleanup: mainly for mesh code, also some WM function use.
Diffstat (limited to 'source/blender/editors/space_node')
-rw-r--r-- | source/blender/editors/space_node/drawnode.c | 18 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_draw.c | 38 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_ops.c | 16 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_select.c | 8 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_state.c | 10 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_templates.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_node/space_node.c | 22 |
7 files changed, 58 insertions, 58 deletions
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 4660b7703d8..b76eb6a4879 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -512,15 +512,15 @@ static int node_resize_area_default(bNode *node, int x, int y) if (node->flag & NODE_HIDDEN) { rctf totr= node->totr; /* right part of node */ - totr.xmin= node->totr.xmax-20.0f; + totr.xmin = node->totr.xmax-20.0f; return BLI_in_rctf(&totr, x, y); } else { /* rect we're interested in is just the bottom right corner */ rctf totr= node->totr; /* bottom right corner */ - totr.xmin= totr.xmax-10.0f; - totr.ymax= totr.ymin+10.0f; + totr.xmin = totr.xmax-10.0f; + totr.ymax = totr.ymin+10.0f; return BLI_in_rctf(&totr, x, y); } } @@ -952,13 +952,13 @@ static void node_update_frame(const bContext *UNUSED(C), bNodeTree *UNUSED(ntree /* get "global" coords */ nodeSpaceCoords(node, &locx, &locy); - node->prvr.xmin= locx + NODE_DYS; - node->prvr.xmax= locx + node->width- NODE_DYS; + node->prvr.xmin = locx + NODE_DYS; + node->prvr.xmax = locx + node->width- NODE_DYS; - node->totr.xmin= locx; - node->totr.xmax= locx + node->width; - node->totr.ymax= locy; - node->totr.ymin= locy - node->height; + node->totr.xmin = locx; + node->totr.xmax = locx + node->width; + node->totr.ymax = locy; + node->totr.ymin = locy - node->height; } static void node_common_set_butfunc(bNodeType *ntype) diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index 3d5dc454768..8cb2aea953e 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -242,8 +242,8 @@ static void node_update_basis(const bContext *C, bNodeTree *ntree, bNode *node) } } - node->prvr.xmin= locx + NODE_DYS; - node->prvr.xmax= locx + node->width- NODE_DYS; + node->prvr.xmin = locx + NODE_DYS; + node->prvr.xmax = locx + node->width- NODE_DYS; /* preview rect? */ if(node->flag & NODE_PREVIEW) { @@ -257,14 +257,14 @@ static void node_update_basis(const bContext *C, bNodeTree *ntree, bNode *node) aspect= (float)node->preview->ysize/(float)node->preview->xsize; dy-= NODE_DYS/2; - node->prvr.ymax= dy; + node->prvr.ymax = dy; if(aspect <= 1.0f) - node->prvr.ymin= dy - aspect*(node->width-NODE_DY); + node->prvr.ymin = dy - aspect*(node->width-NODE_DY); else { float dx= (node->width - NODE_DYS) - (node->width- NODE_DYS)/aspect; /* width correction of image */ - node->prvr.ymin= dy - (node->width-NODE_DY); + node->prvr.ymin = dy - (node->width-NODE_DY); node->prvr.xmin+= 0.5f*dx; node->prvr.xmax-= 0.5f*dx; @@ -281,8 +281,8 @@ static void node_update_basis(const bContext *C, bNodeTree *ntree, bNode *node) if(oldh==0.0f) oldh= 0.6f*node->width-NODE_DY; dy-= NODE_DYS/2; - node->prvr.ymax= dy; - node->prvr.ymin= dy - oldh; + node->prvr.ymax = dy; + node->prvr.ymin = dy - oldh; dy= node->prvr.ymin - NODE_DYS/2; } @@ -294,10 +294,10 @@ static void node_update_basis(const bContext *C, bNodeTree *ntree, bNode *node) dy-= NODE_DYS/2; /* set this for uifunc() that don't use layout engine yet */ - node->butr.xmin= 0; - node->butr.xmax= node->width - 2*NODE_DYS; - node->butr.ymin= 0; - node->butr.ymax= 0; + node->butr.xmin = 0; + node->butr.xmax = node->width - 2*NODE_DYS; + node->butr.ymin = 0; + node->butr.ymax = 0; RNA_pointer_create(&ntree->id, &RNA_Node, node, &ptr); @@ -325,10 +325,10 @@ static void node_update_basis(const bContext *C, bNodeTree *ntree, bNode *node) if(node->inputs.first || (node->flag & (NODE_OPTIONS|NODE_PREVIEW))==0 ) dy-= NODE_DYS/2; - node->totr.xmin= locx; - node->totr.xmax= locx + node->width; - node->totr.ymax= locy; - node->totr.ymin= MIN2(dy, locy-2*NODE_DY); + node->totr.xmin = locx; + node->totr.xmax = locx + node->width; + node->totr.ymax = locy; + node->totr.ymin = MIN2(dy, locy-2*NODE_DY); /* Set the block bounds to clip mouse events from underlying nodes. * Add a margin for sockets on each side. @@ -364,10 +364,10 @@ static void node_update_hidden(bNode *node) hiddenrad += 5.0f*(float)(tot-4); } - node->totr.xmin= locx; - node->totr.xmax= locx + 3*hiddenrad + node->miniwidth; - node->totr.ymax= locy + (hiddenrad - 0.5f*NODE_DY); - node->totr.ymin= node->totr.ymax - 2*hiddenrad; + node->totr.xmin = locx; + node->totr.xmax = locx + 3*hiddenrad + node->miniwidth; + node->totr.ymax = locy + (hiddenrad - 0.5f*NODE_DY); + node->totr.ymin = node->totr.ymax - 2*hiddenrad; /* output sockets */ rad=drad= (float)M_PI/(1.0f + (float)totout); diff --git a/source/blender/editors/space_node/node_ops.c b/source/blender/editors/space_node/node_ops.c index 93263a2e54b..e1493b5b1a5 100644 --- a/source/blender/editors/space_node/node_ops.c +++ b/source/blender/editors/space_node/node_ops.c @@ -110,24 +110,24 @@ void ED_operatormacros_node(void) wmOperatorType *ot; wmOperatorTypeMacro *mot; - ot= WM_operatortype_append_macro("NODE_OT_duplicate_move", "Duplicate", OPTYPE_UNDO|OPTYPE_REGISTER); + ot = WM_operatortype_append_macro("NODE_OT_duplicate_move", "Duplicate", OPTYPE_UNDO|OPTYPE_REGISTER); ot->description = "Duplicate selected nodes and move them"; WM_operatortype_macro_define(ot, "NODE_OT_duplicate"); WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate"); /* modified operator call for duplicating with input links */ - ot= WM_operatortype_append_macro("NODE_OT_duplicate_move_keep_inputs", "Duplicate", OPTYPE_UNDO|OPTYPE_REGISTER); + ot = WM_operatortype_append_macro("NODE_OT_duplicate_move_keep_inputs", "Duplicate", OPTYPE_UNDO|OPTYPE_REGISTER); ot->description = "Duplicate selected nodes keeping input links and move them"; mot = WM_operatortype_macro_define(ot, "NODE_OT_duplicate"); RNA_boolean_set(mot->ptr, "keep_inputs", TRUE); WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate"); - ot= WM_operatortype_append_macro("NODE_OT_select_link_viewer", "Link Viewer", OPTYPE_UNDO); + ot = WM_operatortype_append_macro("NODE_OT_select_link_viewer", "Link Viewer", OPTYPE_UNDO); ot->description = "Select node and link it to a viewer node"; WM_operatortype_macro_define(ot, "NODE_OT_select"); WM_operatortype_macro_define(ot, "NODE_OT_link_viewer"); - ot= WM_operatortype_append_macro("NODE_OT_move_detach_links", "Detach", OPTYPE_UNDO|OPTYPE_REGISTER); + ot = WM_operatortype_append_macro("NODE_OT_move_detach_links", "Detach", OPTYPE_UNDO|OPTYPE_REGISTER); ot->description = "Move a node to detach links"; WM_operatortype_macro_define(ot, "NODE_OT_links_detach"); mot = WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate"); @@ -140,12 +140,12 @@ void node_keymap(struct wmKeyConfig *keyconf) wmKeyMapItem *kmi; /* Entire Editor only ----------------- */ - keymap= WM_keymap_find(keyconf, "Node Generic", SPACE_NODE, 0); + keymap = WM_keymap_find(keyconf, "Node Generic", SPACE_NODE, 0); WM_keymap_add_item(keymap, "NODE_OT_properties", NKEY, KM_PRESS, 0, 0); /* Main Area only ----------------- */ - keymap= WM_keymap_find(keyconf, "Node Editor", SPACE_NODE, 0); + keymap = WM_keymap_find(keyconf, "Node Editor", SPACE_NODE, 0); /* mouse select in nodes used to be both keys, but perhaps this should be reduced? * NOTE: mouse-clicks on left-mouse will fall through to allow transform-tweak, but also link/resize @@ -170,9 +170,9 @@ void node_keymap(struct wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "NODE_OT_select_link_viewer", LEFTMOUSE, KM_PRESS, KM_SHIFT|KM_CTRL, 0); WM_keymap_add_item(keymap, "NODE_OT_backimage_move", MIDDLEMOUSE, KM_PRESS, KM_ALT, 0); - kmi= WM_keymap_add_item(keymap, "NODE_OT_backimage_zoom", VKEY, KM_PRESS, 0, 0); + kmi = WM_keymap_add_item(keymap, "NODE_OT_backimage_zoom", VKEY, KM_PRESS, 0, 0); RNA_float_set(kmi->ptr, "factor", 0.83333f); - kmi= WM_keymap_add_item(keymap, "NODE_OT_backimage_zoom", VKEY, KM_PRESS, KM_ALT, 0); + kmi = WM_keymap_add_item(keymap, "NODE_OT_backimage_zoom", VKEY, KM_PRESS, KM_ALT, 0); RNA_float_set(kmi->ptr, "factor", 1.2f); WM_keymap_add_item(keymap, "NODE_OT_backimage_sample", ACTIONMOUSE, KM_PRESS, KM_ALT, 0); diff --git a/source/blender/editors/space_node/node_select.c b/source/blender/editors/space_node/node_select.c index 9c77cbb86cc..da8fa577656 100644 --- a/source/blender/editors/space_node/node_select.c +++ b/source/blender/editors/space_node/node_select.c @@ -553,12 +553,12 @@ static int node_borderselect_exec(bContext *C, wmOperator *op) 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"); + rect.xmin = RNA_int_get(op->ptr, "xmin"); + rect.ymin = RNA_int_get(op->ptr, "ymin"); UI_view2d_region_to_view(&ar->v2d, rect.xmin, rect.ymin, &rectf.xmin, &rectf.ymin); - rect.xmax= RNA_int_get(op->ptr, "xmax"); - rect.ymax= RNA_int_get(op->ptr, "ymax"); + rect.xmax = RNA_int_get(op->ptr, "xmax"); + 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) { diff --git a/source/blender/editors/space_node/node_state.c b/source/blender/editors/space_node/node_state.c index a9260e80e94..2ab24141c7d 100644 --- a/source/blender/editors/space_node/node_state.c +++ b/source/blender/editors/space_node/node_state.c @@ -67,7 +67,7 @@ static void snode_home(ScrArea *UNUSED(sa), ARegion *ar, SpaceNode* snode) oldwidth= cur->xmax - cur->xmin; oldheight= cur->ymax - cur->ymin; - cur->xmin= cur->ymin= 0.0f; + cur->xmin = cur->ymin = 0.0f; cur->xmax=ar->winx; cur->ymax=ar->winy; @@ -91,14 +91,14 @@ static void snode_home(ScrArea *UNUSED(sa), ARegion *ar, SpaceNode* snode) if(width > height) { float newheight; newheight= oldheight * width/oldwidth; - cur->ymin= cur->ymin - newheight/4; - cur->ymax= cur->ymax + newheight/4; + cur->ymin = cur->ymin - newheight/4; + cur->ymax = cur->ymax + newheight/4; } else { float newwidth; newwidth= oldwidth * height/oldheight; - cur->xmin= cur->xmin - newwidth/4; - cur->xmax= cur->xmax + newwidth/4; + cur->xmin = cur->xmin - newwidth/4; + cur->xmax = cur->xmax + newwidth/4; } ar->v2d.tot= ar->v2d.cur; diff --git a/source/blender/editors/space_node/node_templates.c b/source/blender/editors/space_node/node_templates.c index c0d366a3ed3..298867c18af 100644 --- a/source/blender/editors/space_node/node_templates.c +++ b/source/blender/editors/space_node/node_templates.c @@ -509,10 +509,10 @@ void uiTemplateNodeLink(uiLayout *layout, bNodeTree *ntree, bNode *node, bNodeSo if(sock->link || sock->type == SOCK_SHADER || (sock->flag & SOCK_HIDE_VALUE)) { char name[UI_MAX_NAME_STR]; ui_node_sock_name(sock, name); - but= uiDefMenuBut(block, ui_template_node_link_menu, NULL, name, 0, 0, UI_UNIT_X*4, UI_UNIT_Y, ""); + but = uiDefMenuBut(block, ui_template_node_link_menu, NULL, name, 0, 0, UI_UNIT_X*4, UI_UNIT_Y, ""); } else - but= uiDefIconMenuBut(block, ui_template_node_link_menu, NULL, ICON_NONE, 0, 0, UI_UNIT_X, UI_UNIT_Y, ""); + but = uiDefIconMenuBut(block, ui_template_node_link_menu, NULL, ICON_NONE, 0, 0, UI_UNIT_X, UI_UNIT_Y, ""); but->type= MENU; but->flag |= UI_TEXT_LEFT|UI_BUT_NODE_LINK; diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c index 93d3b22e092..fc5965535b1 100644 --- a/source/blender/editors/space_node/space_node.c +++ b/source/blender/editors/space_node/space_node.c @@ -125,15 +125,15 @@ static SpaceLink *node_new(const bContext *UNUSED(C)) BLI_addtail(&snode->regionbase, ar); ar->regiontype= RGN_TYPE_WINDOW; - ar->v2d.tot.xmin= -256.0f; - ar->v2d.tot.ymin= -256.0f; - ar->v2d.tot.xmax= 768.0f; - ar->v2d.tot.ymax= 768.0f; + ar->v2d.tot.xmin = -256.0f; + ar->v2d.tot.ymin = -256.0f; + ar->v2d.tot.xmax = 768.0f; + ar->v2d.tot.ymax = 768.0f; - ar->v2d.cur.xmin= -256.0f; - ar->v2d.cur.ymin= -256.0f; - ar->v2d.cur.xmax= 768.0f; - ar->v2d.cur.ymax= 768.0f; + ar->v2d.cur.xmin = -256.0f; + ar->v2d.cur.ymin = -256.0f; + ar->v2d.cur.xmax = 768.0f; + ar->v2d.cur.ymax = 768.0f; ar->v2d.min[0]= 1.0f; ar->v2d.min[1]= 1.0f; @@ -330,7 +330,7 @@ static void node_buttons_area_init(wmWindowManager *wm, ARegion *ar) ED_region_panels_init(wm, ar); - keymap= WM_keymap_find(wm->defaultconf, "Node Generic", SPACE_NODE, 0); + keymap = WM_keymap_find(wm->defaultconf, "Node Generic", SPACE_NODE, 0); WM_event_add_keymap_handler(&ar->handlers, keymap); } @@ -348,10 +348,10 @@ static void node_main_area_init(wmWindowManager *wm, ARegion *ar) UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_CUSTOM, ar->winx, ar->winy); /* own keymaps */ - keymap= WM_keymap_find(wm->defaultconf, "Node Generic", SPACE_NODE, 0); + keymap = WM_keymap_find(wm->defaultconf, "Node Generic", SPACE_NODE, 0); WM_event_add_keymap_handler(&ar->handlers, keymap); - keymap= WM_keymap_find(wm->defaultconf, "Node Editor", SPACE_NODE, 0); + keymap = WM_keymap_find(wm->defaultconf, "Node Editor", SPACE_NODE, 0); WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct); /* add drop boxes */ |