From 01e9dae3dc6c7de00e441a8b505debc6df830520 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 18 Mar 2013 18:25:05 +0000 Subject: code cleanup --- source/blender/editors/space_node/drawnode.c | 49 ++++++++++--------- source/blender/editors/space_node/node_add.c | 4 +- source/blender/editors/space_node/node_buttons.c | 24 +++++----- source/blender/editors/space_node/node_draw.c | 16 +++---- source/blender/editors/space_node/node_edit.c | 56 +++++++++++----------- source/blender/editors/space_node/node_group.c | 40 ++++++++-------- source/blender/editors/space_node/node_ops.c | 6 +-- .../editors/space_node/node_relationships.c | 4 +- source/blender/editors/space_node/node_select.c | 5 +- source/blender/editors/space_node/node_templates.c | 13 ++--- source/blender/editors/space_node/node_view.c | 2 +- source/blender/editors/space_node/space_node.c | 24 +++++----- 12 files changed, 124 insertions(+), 119 deletions(-) (limited to 'source/blender/editors/space_node') diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index fddecf267a9..0b02aef2fab 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -81,34 +81,34 @@ static void node_add_menu_class(bContext *C, uiLayout *layout, void *arg_nodeclass) { - Scene *scene= CTX_data_scene(C); - SpaceNode *snode= CTX_wm_space_node(C); + Scene *scene = CTX_data_scene(C); + SpaceNode *snode = CTX_wm_space_node(C); bNodeTree *ntree; - int nodeclass= GET_INT_FROM_POINTER(arg_nodeclass); - int event, compatibility= 0; + int nodeclass = GET_INT_FROM_POINTER(arg_nodeclass); + int event, compatibility = 0; ntree = snode->nodetree; - if(!ntree) { + if (!ntree) { uiItemS(layout); return; } - if(ntree->type == NTREE_SHADER) { - if(BKE_scene_use_new_shading_nodes(scene)) - compatibility= NODE_NEW_SHADING; + if (ntree->type == NTREE_SHADER) { + if (BKE_scene_use_new_shading_nodes(scene)) + compatibility = NODE_NEW_SHADING; else - compatibility= NODE_OLD_SHADING; + compatibility = NODE_OLD_SHADING; } - if (nodeclass==NODE_CLASS_GROUP) { - Main *bmain= CTX_data_main(C); + if (nodeclass == NODE_CLASS_GROUP) { + Main *bmain = CTX_data_main(C); bNodeTree *ngroup; const char *ngroup_type, *node_type; PointerRNA ptr; NODE_TYPES_BEGIN(ntype) - if (ntype->nclass!=nodeclass || !ntype->ui_name) + if (ntype->nclass != nodeclass || !ntype->ui_name) continue; if (!ntype->poll(ntype, ntree)) continue; @@ -132,33 +132,32 @@ static void node_add_menu_class(bContext *C, uiLayout *layout, void *arg_nodecla RNA_string_set(&ptr, "node_type", node_type); uiItemS(layout); - - for(ngroup=bmain->nodetree.first, event=0; ngroup; ngroup= ngroup->id.next, ++event) { + + for (ngroup = bmain->nodetree.first, event = 0; ngroup; ngroup = ngroup->id.next, ++event) { /* only use group trees of the right type */ - if (strcmp(ngroup->idname, ngroup_type)!=0) + if (STRNEQ(ngroup->idname, ngroup_type)) continue; if (!nodeGroupPoll(ntree, ngroup)) continue; - ptr = uiItemFullO(layout, "NODE_OT_add_group_node", ngroup->id.name+2, ntype->ui_icon, NULL, WM_OP_INVOKE_DEFAULT, UI_ITEM_O_RETURN_PROPS); + ptr = uiItemFullO(layout, "NODE_OT_add_group_node", ngroup->id.name + 2, ntype->ui_icon, NULL, WM_OP_INVOKE_DEFAULT, UI_ITEM_O_RETURN_PROPS); RNA_string_set(&ptr, "type", ntype->idname); - RNA_string_set(&ptr, "grouptree", ngroup->id.name+2); + RNA_string_set(&ptr, "grouptree", ngroup->id.name + 2); } NODE_TYPES_END } - else if (nodeclass==NODE_DYNAMIC) { + else if (nodeclass == NODE_DYNAMIC) { /* disabled */ } - else - { + else { PointerRNA ptr; NODE_TYPES_BEGIN(ntype) - if (ntype->nclass!=nodeclass || !ntype->ui_name) + if (ntype->nclass != nodeclass || !ntype->ui_name) continue; if (!ntype->poll(ntype, ntree)) continue; - if (compatibility && (ntype->compatibility & compatibility)==0) + if (compatibility && (ntype->compatibility & compatibility) == 0) continue; ptr = uiItemFullO(layout, "NODE_OT_add_node", IFACE_(ntype->ui_name), ntype->ui_icon, NULL, WM_OP_INVOKE_DEFAULT, UI_ITEM_O_RETURN_PROPS); @@ -169,15 +168,15 @@ static void node_add_menu_class(bContext *C, uiLayout *layout, void *arg_nodecla static void node_add_menu_foreach_class_cb(void *calldata, int nclass, const char *name) { - uiLayout *layout= calldata; + uiLayout *layout = calldata; uiItemMenuF(layout, IFACE_(name), 0, node_add_menu_class, SET_INT_IN_POINTER(nclass)); } static void node_add_menu_default(const bContext *C, uiLayout *layout, bNodeTree *ntree) { - Scene *scene= CTX_data_scene(C); + Scene *scene = CTX_data_scene(C); - if(ntree->typeinfo->foreach_nodeclass) + if (ntree->typeinfo->foreach_nodeclass) ntree->typeinfo->foreach_nodeclass(scene, layout, node_add_menu_foreach_class_cb); } diff --git a/source/blender/editors/space_node/node_add.c b/source/blender/editors/space_node/node_add.c index cd04957c0a5..765f2b67549 100644 --- a/source/blender/editors/space_node/node_add.c +++ b/source/blender/editors/space_node/node_add.c @@ -324,7 +324,7 @@ static int node_add_file_exec(bContext *C, wmOperator *op) SpaceNode *snode = CTX_wm_space_node(C); bNode *node; Image *ima = NULL; - int type= 0; + int type = 0; /* check input variables */ if (RNA_struct_property_is_set(op->ptr, "filepath")) { @@ -427,7 +427,7 @@ void NODE_OT_add_file(wmOperatorType *ot) static int new_node_tree_exec(bContext *C, wmOperator *op) { - SpaceNode *snode= CTX_wm_space_node(C); + SpaceNode *snode = CTX_wm_space_node(C); Main *bmain = CTX_data_main(C); bNodeTree *ntree; PointerRNA ptr, idptr; diff --git a/source/blender/editors/space_node/node_buttons.c b/source/blender/editors/space_node/node_buttons.c index 30cc3b93e8a..31e3cebeb3f 100644 --- a/source/blender/editors/space_node/node_buttons.c +++ b/source/blender/editors/space_node/node_buttons.c @@ -162,7 +162,7 @@ static void node_sockets_panel(const bContext *C, Panel *pa) static int node_tree_interface_poll(const bContext *C, PanelType *UNUSED(pt)) { - SpaceNode *snode= CTX_wm_space_node(C); + SpaceNode *snode = CTX_wm_space_node(C); return (snode && snode->edittree && (snode->edittree->inputs.first || snode->edittree->outputs.first)); } @@ -192,14 +192,14 @@ static int node_tree_find_active_socket(bNodeTree *ntree, bNodeSocket **r_sock, static void node_tree_interface_panel(const bContext *C, Panel *pa) { - SpaceNode *snode= CTX_wm_space_node(C); - bNodeTree *ntree= (snode) ? snode->edittree : NULL; + SpaceNode *snode = CTX_wm_space_node(C); + bNodeTree *ntree = (snode) ? snode->edittree : NULL; bNodeSocket *sock; int in_out; - uiLayout *layout= pa->layout, *row, *split, *col; + uiLayout *layout = pa->layout, *row, *split, *col; PointerRNA ptr, sockptr, opptr; - - if(!ntree) + + if (!ntree) return; RNA_id_pointer_create((ID *)ntree, &ptr); @@ -212,13 +212,13 @@ static void node_tree_interface_panel(const bContext *C, Panel *pa) split = uiLayoutRow(row, TRUE); col = uiLayoutColumn(split, TRUE); uiItemL(col, "Inputs:", ICON_NONE); - uiTemplateList(col, (bContext*)C, "NODE_UL_interface_sockets", "", &ptr, "inputs", &ptr, "active_input", 0, 0, 0); + uiTemplateList(col, (bContext *)C, "NODE_UL_interface_sockets", "", &ptr, "inputs", &ptr, "active_input", 0, 0, 0); opptr = uiItemFullO(col, "NODE_OT_tree_socket_add", "", ICON_PLUS, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_O_RETURN_PROPS); RNA_enum_set(&opptr, "in_out", SOCK_IN); col = uiLayoutColumn(split, TRUE); uiItemL(col, "Outputs:", ICON_NONE); - uiTemplateList(col, (bContext*)C, "NODE_UL_interface_sockets", "", &ptr, "outputs", &ptr, "active_output", 0, 0, 0); + uiTemplateList(col, (bContext *)C, "NODE_UL_interface_sockets", "", &ptr, "outputs", &ptr, "active_output", 0, 0, 0); opptr = uiItemFullO(col, "NODE_OT_tree_socket_add", "", ICON_PLUS, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_O_RETURN_PROPS); RNA_enum_set(&opptr, "in_out", SOCK_OUT); @@ -236,7 +236,7 @@ static void node_tree_interface_panel(const bContext *C, Panel *pa) uiItemS(layout); if (sock->typeinfo->interface_draw) - sock->typeinfo->interface_draw((bContext*)C, layout, &sockptr); + sock->typeinfo->interface_draw((bContext *)C, layout, &sockptr); } } @@ -261,11 +261,11 @@ void node_buttons_register(ARegionType *art) pt->flag |= PNL_DEFAULT_CLOSED; BLI_addtail(&art->paneltypes, pt); - pt= MEM_callocN(sizeof(PanelType), "spacetype node panel tree interface"); + pt = MEM_callocN(sizeof(PanelType), "spacetype node panel tree interface"); strcpy(pt->idname, "NODE_PT_node_tree_interface"); strcpy(pt->label, "Interface"); - pt->draw= node_tree_interface_panel; - pt->poll= node_tree_interface_poll; + pt->draw = node_tree_interface_panel; + pt->poll = node_tree_interface_poll; BLI_addtail(&art->paneltypes, pt); pt = MEM_callocN(sizeof(PanelType), "spacetype node panel gpencil"); diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index 80a6ff1a393..0636dee9bc5 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -89,17 +89,17 @@ static bNodeTree *node_tree_from_ID(ID *id) switch (idtype) { case ID_NT: - return (bNodeTree*)id; + return (bNodeTree *)id; case ID_MA: - return ((Material*)id)->nodetree; + return ((Material *)id)->nodetree; case ID_LA: - return ((Lamp*)id)->nodetree; + return ((Lamp *)id)->nodetree; case ID_WO: - return ((World*)id)->nodetree; + return ((World *)id)->nodetree; case ID_SCE: - return ((Scene*)id)->nodetree; + return ((Scene *)id)->nodetree; case ID_TE: - return ((Tex*)id)->nodetree; + return ((Tex *)id)->nodetree; } } @@ -339,7 +339,7 @@ static void node_update_basis(const bContext *C, bNodeTree *ntree, bNode *node) RNA_pointer_create(&ntree->id, &RNA_NodeSocket, nsock, &sockptr); layout = uiBlockLayout(node->block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, - locx+NODE_DYS, dy, NODE_WIDTH(node)-NODE_DY, NODE_DY, UI_GetStyle()); + locx + NODE_DYS, dy, NODE_WIDTH(node) - NODE_DY, NODE_DY, UI_GetStyle()); /* context pointers for current node and socket */ uiLayoutSetContextPointer(layout, "node", &nodeptr); uiLayoutSetContextPointer(layout, "socket", &sockptr); @@ -427,7 +427,7 @@ static void node_update_basis(const bContext *C, bNodeTree *ntree, bNode *node) RNA_pointer_create(&ntree->id, &RNA_NodeSocket, nsock, &sockptr); layout = uiBlockLayout(node->block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, - locx+NODE_DYS, dy, NODE_WIDTH(node)-NODE_DY, NODE_DY, UI_GetStyle()); + locx + NODE_DYS, dy, NODE_WIDTH(node) - NODE_DY, NODE_DY, UI_GetStyle()); /* context pointers for current node and socket */ uiLayoutSetContextPointer(layout, "node", &nodeptr); uiLayoutSetContextPointer(layout, "socket", &sockptr); diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index 2012284f39b..98f5939b367 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -290,11 +290,11 @@ void snode_notify(bContext *C, SpaceNode *snode) { WM_event_add_notifier(C, NC_NODE | NA_EDITED, NULL); - if(ED_node_is_shader(snode)) + if (ED_node_is_shader(snode)) WM_event_add_notifier(C, NC_MATERIAL | ND_NODES, snode->id); - else if(ED_node_is_compositor(snode)) + else if (ED_node_is_compositor(snode)) WM_event_add_notifier(C, NC_SCENE | ND_NODES, snode->id); - else if(ED_node_is_texture(snode)) + else if (ED_node_is_texture(snode)) WM_event_add_notifier(C, NC_TEXTURE | ND_NODES, snode->id); } @@ -308,17 +308,17 @@ void ED_node_set_tree_type(SpaceNode *snode, bNodeTreeType *typeinfo) int ED_node_is_compositor(struct SpaceNode *snode) { - return (strcmp(snode->tree_idname, ntreeType_Composite->idname)==0); + return STREQ(snode->tree_idname, ntreeType_Composite->idname); } int ED_node_is_shader(struct SpaceNode *snode) { - return (strcmp(snode->tree_idname, ntreeType_Shader->idname)==0); + return STREQ(snode->tree_idname, ntreeType_Shader->idname); } int ED_node_is_texture(struct SpaceNode *snode) { - return (strcmp(snode->tree_idname, ntreeType_Texture->idname)==0); + return STREQ(snode->tree_idname, ntreeType_Texture->idname); } /* assumes nothing being done in ntree yet, sets the default in/out node */ @@ -513,8 +513,9 @@ void snode_set_context(const bContext *C) snode->flag &= ~SNODE_NEW_SHADERS; /* check the tree type */ - if (!treetype - || (treetype->poll && !treetype->poll(C, treetype))) { + if (!treetype || + (treetype->poll && !treetype->poll(C, treetype))) + { /* invalid tree type, disable */ snode->tree_idname[0] = '\0'; ED_node_tree_start(snode, NULL, NULL, NULL); @@ -533,8 +534,9 @@ void snode_set_context(const bContext *C) treetype->get_from_context(C, treetype, &ntree, &id, &from); } - if (snode->nodetree!=ntree || snode->id!=id || snode->from!=snode->from) + if (snode->nodetree != ntree || snode->id != id || snode->from != snode->from) { ED_node_tree_start(snode, ntree, id, from); + } } void snode_update(SpaceNode *snode, bNode *node) @@ -547,11 +549,11 @@ void snode_update(SpaceNode *snode, bNode *node) */ /* update all edited group nodes */ - path=snode->treepath.last; + path = snode->treepath.last; if (path) { bNodeTree *ngroup = path->nodetree; - for (path=path->prev; path; path=path->prev) { - nodeUpdateID(path->nodetree, (ID*)ngroup); + for (path = path->prev; path; path = path->prev) { + nodeUpdateID(path->nodetree, (ID *)ngroup); ngroup = path->nodetree; } } @@ -2077,15 +2079,15 @@ static int ntree_socket_add_exec(bContext *C, wmOperator *op) void NODE_OT_tree_socket_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Node Tree Interface Socket"; - ot->idname= "NODE_OT_tree_socket_add"; + ot->name = "Add Node Tree Interface Socket"; + ot->idname = "NODE_OT_tree_socket_add"; /* api callbacks */ - ot->exec= ntree_socket_add_exec; - ot->poll= ED_operator_node_active; + ot->exec = ntree_socket_add_exec; + ot->poll = ED_operator_node_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; RNA_def_enum(ot->srna, "in_out", node_socket_in_out_items, SOCK_IN, "Socket Type", ""); } @@ -2120,15 +2122,15 @@ static int ntree_socket_remove_exec(bContext *C, wmOperator *UNUSED(op)) void NODE_OT_tree_socket_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Node Tree Interface Socket"; - ot->idname= "NODE_OT_tree_socket_remove"; + ot->name = "Remove Node Tree Interface Socket"; + ot->idname = "NODE_OT_tree_socket_remove"; /* api callbacks */ - ot->exec= ntree_socket_remove_exec; - ot->poll= ED_operator_node_active; + ot->exec = ntree_socket_remove_exec; + ot->poll = ED_operator_node_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; } /********************** Move interface socket operator *********************/ @@ -2185,15 +2187,15 @@ static int ntree_socket_move_exec(bContext *C, wmOperator *op) void NODE_OT_tree_socket_move(wmOperatorType *ot) { /* identifiers */ - ot->name= "Move Node Tree Socket"; - ot->idname= "NODE_OT_tree_socket_move"; + ot->name = "Move Node Tree Socket"; + ot->idname = "NODE_OT_tree_socket_move"; /* api callbacks */ - ot->exec= ntree_socket_move_exec; - ot->poll= ED_operator_node_active; + ot->exec = ntree_socket_move_exec; + ot->poll = ED_operator_node_active; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; RNA_def_enum(ot->srna, "direction", move_direction_items, 1, "Direction", ""); } diff --git a/source/blender/editors/space_node/node_group.c b/source/blender/editors/space_node/node_group.c index ba98f9ea94d..f460c68638f 100644 --- a/source/blender/editors/space_node/node_group.c +++ b/source/blender/editors/space_node/node_group.c @@ -137,7 +137,7 @@ static bNode *node_group_get_active(bContext *C, const char *node_idname) SpaceNode *snode = CTX_wm_space_node(C); bNode *node = nodeGetActive(snode->edittree); - if (node && strcmp(node->idname, node_idname)==0) + if (node && STREQ(node->idname, node_idname)) return node; else return NULL; @@ -161,7 +161,7 @@ static int node_group_edit_exec(bContext *C, wmOperator *op) MEM_freeN(node_idname); if (gnode && !exit) { - bNodeTree *ngroup= (bNodeTree*)gnode->id; + bNodeTree *ngroup = (bNodeTree *)gnode->id; if (ngroup) { if (ngroup->id.lib) @@ -240,8 +240,8 @@ static int node_group_ungroup(bNodeTree *ntree, bNode *gnode) wgroup = ntreeCopyTree_ex(ngroup, FALSE); /* Add the nodes into the ntree */ - for(node= wgroup->nodes.first; node; node= nextnode) { - nextnode= node->next; + for (node = wgroup->nodes.first; node; node = nextnode) { + nextnode = node->next; /* Remove interface nodes. * This also removes remaining links to and from interface nodes. @@ -329,7 +329,7 @@ static int node_group_ungroup(bNodeTree *ntree, bNode *gnode) /* find external links to this input */ for (tlink = ntree->links.first; tlink; tlink = tlink->next) { - if (tlink->tonode == gnode && strcmp(tlink->tosock->identifier, identifier)==0) { + if (tlink->tonode == gnode && STREQ(tlink->tosock->identifier, identifier)) { nodeAddLink(ntree, tlink->fromnode, tlink->fromsock, link->tonode->new_node, link->tosock->new_sock); ++num_external_links; } @@ -356,7 +356,7 @@ static int node_group_ungroup(bNodeTree *ntree, bNode *gnode) for (tlink = ngroup->links.first; tlink; tlink = tlink->next) { /* only use active output node */ if (tlink->tonode->type == NODE_GROUP_OUTPUT && (tlink->tonode->flag & NODE_DO_OUTPUT)) { - if (strcmp(tlink->tosock->identifier, identifier)==0) { + if (STREQ(tlink->tosock->identifier, identifier)) { nodeAddLink(ntree, tlink->fromnode->new_node, tlink->fromsock->new_sock, link->tonode, link->tosock); ++num_internal_links; } @@ -642,19 +642,19 @@ void NODE_OT_group_separate(wmOperatorType *ot) /* ****************** Make Group operator ******************* */ -static int node_group_make_use_node(bNode *node, bNode *gnode) +static bool node_group_make_use_node(bNode *node, bNode *gnode) { - return (node != gnode - && !ELEM(node->type, NODE_GROUP_INPUT, NODE_GROUP_OUTPUT) - && (node->flag & NODE_SELECT)); + return (node != gnode && + !ELEM(node->type, NODE_GROUP_INPUT, NODE_GROUP_OUTPUT) && + (node->flag & NODE_SELECT)); } -static int node_group_make_test_selected(bNodeTree *ntree, bNode *gnode, const char *ntree_idname, struct ReportList *reports) +static bool node_group_make_test_selected(bNodeTree *ntree, bNode *gnode, const char *ntree_idname, struct ReportList *reports) { bNodeTree *ngroup; bNode *node; bNodeLink *link; - int ok = TRUE; + int ok = true; /* make a local pseudo node tree to pass to the node poll functions */ ngroup = ntreeAddTree(NULL, "Pseudo Node Group", ntree_idname); @@ -664,7 +664,7 @@ static int node_group_make_test_selected(bNodeTree *ntree, bNode *gnode, const c if (node_group_make_use_node(node, gnode)) { if (!node->typeinfo->poll_instance(node, ngroup)) { BKE_reportf(reports, RPT_WARNING, "Can not add node '%s' in a group", node->name); - ok = FALSE; + ok = false; break; } } @@ -676,7 +676,7 @@ static int node_group_make_test_selected(bNodeTree *ntree, bNode *gnode, const c ntreeFreeTree(ngroup); MEM_freeN(ngroup); if (!ok) - return FALSE; + return false; /* check if all connections are OK, no unselected node has both * inputs and outputs to a selection */ @@ -687,12 +687,14 @@ static int node_group_make_test_selected(bNodeTree *ntree, bNode *gnode, const c link->fromnode->done |= 2; } for (node = ntree->nodes.first; node; node = node->next) { - if (!(node->flag & NODE_SELECT) - && node != gnode - && node->done == 3) - return FALSE; + if (!(node->flag & NODE_SELECT) && + node != gnode && + node->done == 3) + { + return false; + } } - return TRUE; + return true; } static int node_get_selected_minmax(bNodeTree *ntree, bNode *gnode, float *min, float *max) diff --git a/source/blender/editors/space_node/node_ops.c b/source/blender/editors/space_node/node_ops.c index db664265466..1e4e02b6ae1 100644 --- a/source/blender/editors/space_node/node_ops.c +++ b/source/blender/editors/space_node/node_ops.c @@ -213,11 +213,11 @@ static void node_group_operators(wmKeyMap *keymap, const char *node_type) kmi = WM_keymap_add_item(keymap, "NODE_OT_group_separate", PKEY, KM_PRESS, 0, 0); RNA_string_set(kmi->ptr, "node_type", node_type); - kmi= WM_keymap_add_item(keymap, "NODE_OT_group_edit", TABKEY, KM_PRESS, 0, 0); + kmi = WM_keymap_add_item(keymap, "NODE_OT_group_edit", TABKEY, KM_PRESS, 0, 0); RNA_string_set(kmi->ptr, "node_type", node_type); RNA_boolean_set(kmi->ptr, "exit", FALSE); - kmi= WM_keymap_add_item(keymap, "NODE_OT_group_edit", TABKEY, KM_PRESS, KM_SHIFT, 0); + kmi = WM_keymap_add_item(keymap, "NODE_OT_group_edit", TABKEY, KM_PRESS, KM_SHIFT, 0); RNA_string_set(kmi->ptr, "node_type", node_type); RNA_boolean_set(kmi->ptr, "exit", TRUE); } @@ -263,7 +263,7 @@ void node_keymap(struct wmKeyConfig *keyconf) kmi = WM_keymap_add_item(keymap, "NODE_OT_link", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0); RNA_boolean_set(kmi->ptr, "detach", FALSE); RNA_boolean_set(kmi->ptr, "expose", TRUE); - kmi = WM_keymap_add_item(keymap, "NODE_OT_link", LEFTMOUSE, KM_PRESS, KM_SHIFT|KM_CTRL, 0); + kmi = WM_keymap_add_item(keymap, "NODE_OT_link", LEFTMOUSE, KM_PRESS, KM_SHIFT | KM_CTRL, 0); RNA_boolean_set(kmi->ptr, "detach", TRUE); RNA_boolean_set(kmi->ptr, "expose", TRUE); WM_keymap_add_item(keymap, "NODE_OT_resize", LEFTMOUSE, KM_PRESS, 0, 0); diff --git a/source/blender/editors/space_node/node_relationships.c b/source/blender/editors/space_node/node_relationships.c index d95487bb24e..8ff964aa932 100644 --- a/source/blender/editors/space_node/node_relationships.c +++ b/source/blender/editors/space_node/node_relationships.c @@ -108,7 +108,7 @@ static bNodeSocket *best_socket_output(bNodeTree *ntree, bNode *node, bNodeSocke /* check for same types */ if (sock->type == sock_target->type) { - if (strcmp(sock->name, sock_target->name) == 0) + if (STREQ(sock->name, sock_target->name)) return sock; } } @@ -547,7 +547,7 @@ static int node_link_modal(bContext *C, wmOperator *op, const wmEvent *event) { /* place the node at the mouse pointer */ - float sockx = 42.f + 3*HIDDEN_RAD; /* XXX totally arbitrary initial hidden node size ... */ + float sockx = 42.0f + 3 * HIDDEN_RAD; /* XXX totally arbitrary initial hidden node size ... */ float socky = -HIDDEN_RAD; ionode->locx = snode->cursor[0] - sockx; diff --git a/source/blender/editors/space_node/node_select.c b/source/blender/editors/space_node/node_select.c index 291fe86e016..faebeabdbba 100644 --- a/source/blender/editors/space_node/node_select.c +++ b/source/blender/editors/space_node/node_select.c @@ -359,8 +359,9 @@ static int node_mouse_select(Main *bmain, SpaceNode *snode, ARegion *ar, const i node = node_under_mouse_select(snode->edittree, mx, my); if (node) { - for (tnode = snode->edittree->nodes.first; tnode; tnode = tnode->next) - nodeSetSelected(tnode, FALSE); + for (tnode = snode->edittree->nodes.first; tnode; tnode = tnode->next) { + nodeSetSelected(tnode, false); + } nodeSetSelected(node, TRUE); ED_node_set_active(bmain, snode->edittree, node); selected = 1; diff --git a/source/blender/editors/space_node/node_templates.c b/source/blender/editors/space_node/node_templates.c index e4b0512d992..0bc2fba0d0b 100644 --- a/source/blender/editors/space_node/node_templates.c +++ b/source/blender/editors/space_node/node_templates.c @@ -172,7 +172,8 @@ static void node_socket_add_replace(const bContext *C, bNodeTree *ntree, bNode * /* XXX how can this be done nicely? bNodeTemplate is removed, it doesn't work for generic custom nodes */ if (node_prev && node_prev->type == type && - (type != NODE_GROUP || node_prev->id == &ngroup->id)) { + (type != NODE_GROUP || node_prev->id == &ngroup->id)) + { /* keep the previous node if it's the same type */ node_from = node_prev; } @@ -182,8 +183,8 @@ static void node_socket_add_replace(const bContext *C, bNodeTree *ntree, bNode * node_from->locy = node_to->locy; /* XXX bad, should be dispatched to generic operator or something ... */ - if (type==NODE_GROUP) { - node_from->id = (ID*)ngroup; + if (type == NODE_GROUP) { + node_from->id = (ID *)ngroup; } if (node_from->id) @@ -206,7 +207,7 @@ static void node_socket_add_replace(const bContext *C, bNodeTree *ntree, bNode * if (nodeCountSocketLinks(ntree, sock_from) >= sock_from->limit) continue; - if (strcmp(sock_prev->name, sock_from->name) == 0 && sock_prev->type == sock_from->type) { + if (STREQ(sock_prev->name, sock_from->name) && sock_prev->type == sock_from->type) { bNodeLink *link = sock_prev->link; if (link && link->fromnode) { @@ -377,8 +378,8 @@ static void ui_node_menu_column(NodeLinkArg *arg, int nclass, const char *cname) else BLI_strncpy(name, IFACE_(ntype->ui_name), UI_MAX_NAME_STR); - but = uiDefBut(block, BUT, 0, name, 0, 0, UI_UNIT_X*4, UI_UNIT_Y, - NULL, 0.0, 0.0, 0.0, 0.0, TIP_("Add node to input")); + but = uiDefBut(block, BUT, 0, name, 0, 0, UI_UNIT_X * 4, UI_UNIT_Y, + NULL, 0.0, 0.0, 0.0, 0.0, TIP_("Add node to input")); argN = MEM_dupallocN(arg); argN->type = ntype->type; diff --git a/source/blender/editors/space_node/node_view.c b/source/blender/editors/space_node/node_view.c index 1241227c9d8..293913dff11 100644 --- a/source/blender/editors/space_node/node_view.c +++ b/source/blender/editors/space_node/node_view.c @@ -371,7 +371,7 @@ int ED_space_node_color_sample(SpaceNode *snode, ARegion *ar, int mval[2], float float fx, fy, bufx, bufy; int ret = FALSE; - if (strcmp(snode->tree_idname, ntreeType_Composite->idname)==0 || (snode->flag & SNODE_BACKDRAW) == 0) { + if (STREQ(snode->tree_idname, ntreeType_Composite->idname) || (snode->flag & SNODE_BACKDRAW) == 0) { /* use viewer image for color sampling only if we're in compositor tree * with backdrop enabled */ diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c index ac2f36ed51d..2d5207e69db 100644 --- a/source/blender/editors/space_node/space_node.c +++ b/source/blender/editors/space_node/space_node.c @@ -65,7 +65,7 @@ void ED_node_tree_start(SpaceNode *snode, bNodeTree *ntree, ID *id, ID *from) { bNodeTreePath *path, *path_next; - for (path=snode->treepath.first; path; path=path_next) { + for (path = snode->treepath.first; path; path = path_next) { path_next = path->next; MEM_freeN(path); } @@ -76,7 +76,7 @@ void ED_node_tree_start(SpaceNode *snode, bNodeTree *ntree, ID *id, ID *from) path->nodetree = ntree; path->parent_key = NODE_INSTANCE_KEY_BASE; if (id) - BLI_strncpy(path->node_name, id->name+2, sizeof(path->node_name)); + BLI_strncpy(path->node_name, id->name + 2, sizeof(path->node_name)); BLI_addtail(&snode->treepath, path); } @@ -86,7 +86,7 @@ void ED_node_tree_start(SpaceNode *snode, bNodeTree *ntree, ID *id, ID *from) snode->from = from; /* listener updates the View2D center from edittree */ - WM_main_add_notifier(NC_SCENE|ND_NODES, NULL); + WM_main_add_notifier(NC_SCENE | ND_NODES, NULL); } void ED_node_tree_push(SpaceNode *snode, bNodeTree *ntree, bNode *gnode) @@ -111,7 +111,7 @@ void ED_node_tree_push(SpaceNode *snode, bNodeTree *ntree, bNode *gnode) snode->edittree = ntree; /* listener updates the View2D center from edittree */ - WM_main_add_notifier(NC_SCENE|ND_NODES, NULL); + WM_main_add_notifier(NC_SCENE | ND_NODES, NULL); } void ED_node_tree_pop(SpaceNode *snode) @@ -130,7 +130,7 @@ void ED_node_tree_pop(SpaceNode *snode) snode->edittree = path->nodetree; /* listener updates the View2D center from edittree */ - WM_main_add_notifier(NC_SCENE|ND_NODES, NULL); + WM_main_add_notifier(NC_SCENE | ND_NODES, NULL); } int ED_node_tree_depth(SpaceNode *snode) @@ -142,7 +142,7 @@ bNodeTree *ED_node_tree_get(SpaceNode *snode, int level) { bNodeTreePath *path; int i; - for (path = snode->treepath.last, i = 0; path; path=path->prev, ++i) { + for (path = snode->treepath.last, i = 0; path; path = path->prev, ++i) { if (i == level) return path->nodetree; } @@ -154,7 +154,7 @@ int ED_node_tree_path_length(SpaceNode *snode) bNodeTreePath *path; int length = 0; int i; - for (path=snode->treepath.first, i=0; path; path=path->next, ++i) { + for (path = snode->treepath.first, i = 0; path; path = path->next, ++i) { length += strlen(path->node_name); if (i > 0) length += 1; /* for separator char */ @@ -168,7 +168,7 @@ void ED_node_tree_path_get(SpaceNode *snode, char *value) int i; value[0] = '\0'; - for (path=snode->treepath.first, i=0; path; path=path->next, ++i) { + for (path = snode->treepath.first, i = 0; path; path = path->next, ++i) { if (i == 0) { strcpy(value, path->node_name); value += strlen(path->node_name); @@ -186,7 +186,7 @@ void ED_node_tree_path_get_fixedbuf(SpaceNode *snode, char *value, int max_lengt int size, i; value[0] = '\0'; - for (path=snode->treepath.first, i=0; path; path=path->next, ++i) { + for (path = snode->treepath.first, i = 0; path; path = path->next, ++i) { if (i == 0) { BLI_strncpy(value, path->node_name, max_length); size = strlen(path->node_name); @@ -337,10 +337,10 @@ static SpaceLink *node_new(const bContext *UNUSED(C)) static void node_free(SpaceLink *sl) { - SpaceNode *snode = (SpaceNode*)sl; + SpaceNode *snode = (SpaceNode *)sl; bNodeTreePath *path, *path_next; - for (path=snode->treepath.first; path; path=path_next) { + for (path = snode->treepath.first; path; path = path_next) { path_next = path->next; MEM_freeN(path); } @@ -521,7 +521,7 @@ static void node_area_refresh(const struct bContext *C, ScrArea *sa) static SpaceLink *node_duplicate(SpaceLink *sl) { - SpaceNode *snode = (SpaceNode*)sl; + SpaceNode *snode = (SpaceNode *)sl; SpaceNode *snoden = MEM_dupallocN(snode); /* clear or remove stuff from old */ -- cgit v1.2.3