diff options
Diffstat (limited to 'source/blender/editors/space_node')
| -rw-r--r-- | source/blender/editors/space_node/drawnode.c | 7 | ||||
| -rw-r--r-- | source/blender/editors/space_node/node_edit.c | 8 | ||||
| -rw-r--r-- | source/blender/editors/space_node/node_group.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_node/node_intern.h | 8 | ||||
| -rw-r--r-- | source/blender/editors/space_node/node_relationships.c | 12 | ||||
| -rw-r--r-- | source/blender/editors/space_node/node_select.c | 16 |
6 files changed, 27 insertions, 26 deletions
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 5f133aea2bb..b3d29c7bbdd 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -3202,7 +3202,7 @@ int node_link_bezier_points(View2D *v2d, SpaceNode *snode, bNodeLink *link, floa #define LINK_ARROW 12 /* position of arrow on the link, LINK_RESOL/2 */ #define ARROW_SIZE 7 void node_draw_link_bezier(View2D *v2d, SpaceNode *snode, bNodeLink *link, - int th_col1, int do_shaded, int th_col2, int do_triple, int th_col3) + int th_col1, bool do_shaded, int th_col2, bool do_triple, int th_col3) { float coord_array[LINK_RESOL + 1][2]; @@ -3388,8 +3388,9 @@ void node_draw_link_straight(View2D *v2d, SpaceNode *snode, bNodeLink *link, /* note; this is used for fake links in groups too */ void node_draw_link(View2D *v2d, SpaceNode *snode, bNodeLink *link) { - int do_shaded = FALSE, th_col1 = TH_HEADER, th_col2 = TH_HEADER; - int do_triple = FALSE, th_col3 = TH_WIRE; + bool do_shaded = false; + bool do_triple = false; + int th_col1 = TH_HEADER, th_col2 = TH_HEADER, th_col3 = TH_WIRE; if (link->fromsock == NULL && link->tosock == NULL) return; diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index 360b394d406..7a12ed9ef08 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -364,17 +364,17 @@ void ED_node_set_tree_type(SpaceNode *snode, bNodeTreeType *typeinfo) snode->tree_idname[0] = '\0'; } -int ED_node_is_compositor(struct SpaceNode *snode) +bool ED_node_is_compositor(struct SpaceNode *snode) { return STREQ(snode->tree_idname, ntreeType_Composite->idname); } -int ED_node_is_shader(struct SpaceNode *snode) +bool ED_node_is_shader(struct SpaceNode *snode) { return STREQ(snode->tree_idname, ntreeType_Shader->idname); } -int ED_node_is_texture(struct SpaceNode *snode) +bool ED_node_is_texture(struct SpaceNode *snode) { return STREQ(snode->tree_idname, ntreeType_Texture->idname); } @@ -1130,7 +1130,7 @@ static int node_duplicate_exec(bContext *C, wmOperator *op) bNodeTree *ntree = snode->edittree; bNode *node, *newnode, *lastnode; bNodeLink *link, *newlink, *lastlink; - int keep_inputs = RNA_boolean_get(op->ptr, "keep_inputs"); + const bool keep_inputs = RNA_boolean_get(op->ptr, "keep_inputs"); ED_preview_kill_jobs(C); diff --git a/source/blender/editors/space_node/node_group.c b/source/blender/editors/space_node/node_group.c index 1ecedf32499..20e6900a268 100644 --- a/source/blender/editors/space_node/node_group.c +++ b/source/blender/editors/space_node/node_group.c @@ -145,7 +145,7 @@ static int node_group_edit_exec(bContext *C, wmOperator *op) SpaceNode *snode = CTX_wm_space_node(C); const char *node_idname = group_node_idname(C); bNode *gnode; - int exit = RNA_boolean_get(op->ptr, "exit"); + const bool exit = RNA_boolean_get(op->ptr, "exit"); ED_preview_kill_jobs(C); diff --git a/source/blender/editors/space_node/node_intern.h b/source/blender/editors/space_node/node_intern.h index f598a13bea9..fa20aeb8624 100644 --- a/source/blender/editors/space_node/node_intern.h +++ b/source/blender/editors/space_node/node_intern.h @@ -104,9 +104,9 @@ void node_keymap(struct wmKeyConfig *keyconf); /* node_select.c */ void node_deselect_all(struct SpaceNode *snode); void node_socket_select(struct bNode *node, struct bNodeSocket *sock); -void node_socket_deselect(struct bNode *node, struct bNodeSocket *sock, int deselect_node); -void node_deselect_all_input_sockets(struct SpaceNode *snode, int deselect_nodes); -void node_deselect_all_output_sockets(struct SpaceNode *snode, int deselect_nodes); +void node_socket_deselect(struct bNode *node, struct bNodeSocket *sock, const bool deselect_node); +void node_deselect_all_input_sockets(struct SpaceNode *snode, const bool deselect_nodes); +void node_deselect_all_output_sockets(struct SpaceNode *snode, const bool deselect_nodes); int node_select_same_type(struct SpaceNode *snode); int node_select_same_type_np(struct SpaceNode *snode, int dir); void node_select_single(struct bContext *C, struct bNode *node); @@ -136,7 +136,7 @@ void NODE_OT_backimage_sample(struct wmOperatorType *ot); /* drawnode.c */ void node_draw_link(struct View2D *v2d, struct SpaceNode *snode, struct bNodeLink *link); -void node_draw_link_bezier(struct View2D *v2d, struct SpaceNode *snode, struct bNodeLink *link, int th_col1, int do_shaded, int th_col2, int do_triple, int th_col3); +void node_draw_link_bezier(struct View2D *v2d, struct SpaceNode *snode, struct bNodeLink *link, int th_col1, bool do_shaded, int th_col2, bool do_triple, int th_col3); int node_link_bezier_points(struct View2D *v2d, struct SpaceNode *snode, struct bNodeLink *link, float coord_array[][2], int resol); // void node_draw_link_straight(View2D *v2d, SpaceNode *snode, bNodeLink *link, int th_col1, int do_shaded, int th_col2, int do_triple, int th_col3 ); void draw_nodespace_back_pix(const struct bContext *C, struct ARegion *ar, struct SpaceNode *snode, bNodeInstanceKey parent_key); diff --git a/source/blender/editors/space_node/node_relationships.c b/source/blender/editors/space_node/node_relationships.c index b50066560fb..4f9af022639 100644 --- a/source/blender/editors/space_node/node_relationships.c +++ b/source/blender/editors/space_node/node_relationships.c @@ -78,7 +78,7 @@ static int sort_nodes_locx(void *a, void *b) return 0; } -static int socket_is_available(bNodeTree *UNUSED(ntree), bNodeSocket *sock, int allow_used) +static int socket_is_available(bNodeTree *UNUSED(ntree), bNodeSocket *sock, const bool allow_used) { if (nodeSocketIsHidden(sock)) return 0; @@ -89,7 +89,7 @@ static int socket_is_available(bNodeTree *UNUSED(ntree), bNodeSocket *sock, int return 1; } -static bNodeSocket *best_socket_output(bNodeTree *ntree, bNode *node, bNodeSocket *sock_target, int allow_multiple) +static bNodeSocket *best_socket_output(bNodeTree *ntree, bNode *node, bNodeSocket *sock_target, const bool allow_multiple) { bNodeSocket *sock; @@ -184,7 +184,7 @@ static int snode_autoconnect_input(SpaceNode *snode, bNode *node_fr, bNodeSocket return 1; } -static void snode_autoconnect(SpaceNode *snode, int allow_multiple, int replace) +static void snode_autoconnect(SpaceNode *snode, const bool allow_multiple, const bool replace) { bNodeTree *ntree = snode->edittree; ListBase *nodelist = MEM_callocN(sizeof(ListBase), "items_list"); @@ -545,7 +545,7 @@ static int node_link_modal(bContext *C, wmOperator *op, const wmEvent *event) } /* return 1 when socket clicked */ -static bNodeLinkDrag *node_link_init(SpaceNode *snode, float cursor[2], int detach) +static bNodeLinkDrag *node_link_init(SpaceNode *snode, float cursor[2], const bool detach) { bNode *node; bNodeSocket *sock; @@ -641,7 +641,7 @@ static int node_link_invoke(bContext *C, wmOperator *op, const wmEvent *event) bNodeLinkDrag *nldrag; float cursor[2]; - int detach = RNA_boolean_get(op->ptr, "detach"); + const bool detach = RNA_boolean_get(op->ptr, "detach"); UI_view2d_region_to_view(&ar->v2d, event->mval[0], event->mval[1], &cursor[0], &cursor[1]); @@ -700,7 +700,7 @@ void NODE_OT_link(wmOperatorType *ot) static int node_make_link_exec(bContext *C, wmOperator *op) { SpaceNode *snode = CTX_wm_space_node(C); - int replace = RNA_boolean_get(op->ptr, "replace"); + const bool replace = RNA_boolean_get(op->ptr, "replace"); ED_preview_kill_jobs(C); diff --git a/source/blender/editors/space_node/node_select.c b/source/blender/editors/space_node/node_select.c index de0665e13b1..89f07950fe9 100644 --- a/source/blender/editors/space_node/node_select.c +++ b/source/blender/editors/space_node/node_select.c @@ -101,12 +101,12 @@ void node_socket_select(bNode *node, bNodeSocket *sock) node->flag |= SELECT; } -void node_socket_deselect(bNode *node, bNodeSocket *sock, int deselect_node) +void node_socket_deselect(bNode *node, bNodeSocket *sock, const bool deselect_node) { sock->flag &= ~SELECT; if (node && deselect_node) { - int sel = 0; + bool sel = 0; /* if no selected sockets remain, also deselect the node */ for (sock = node->inputs.first; sock; sock = sock->next) { @@ -144,7 +144,7 @@ void node_deselect_all(SpaceNode *snode) nodeSetSelected(node, FALSE); } -void node_deselect_all_input_sockets(SpaceNode *snode, int deselect_nodes) +void node_deselect_all_input_sockets(SpaceNode *snode, const bool deselect_nodes) { bNode *node; bNodeSocket *sock; @@ -175,7 +175,7 @@ void node_deselect_all_input_sockets(SpaceNode *snode, int deselect_nodes) } } -void node_deselect_all_output_sockets(SpaceNode *snode, int deselect_nodes) +void node_deselect_all_output_sockets(SpaceNode *snode, const bool deselect_nodes) { bNode *node; bNodeSocket *sock; @@ -186,7 +186,7 @@ void node_deselect_all_output_sockets(SpaceNode *snode, int deselect_nodes) */ for (node = snode->edittree->nodes.first; node; node = node->next) { - int sel = 0; + bool sel = false; for (sock = node->outputs.first; sock; sock = sock->next) sock->flag &= ~SELECT; @@ -473,7 +473,7 @@ static int node_borderselect_exec(bContext *C, wmOperator *op) static int node_border_select_invoke(bContext *C, wmOperator *op, const wmEvent *event) { - int tweak = RNA_boolean_get(op->ptr, "tweak"); + const bool tweak = RNA_boolean_get(op->ptr, "tweak"); if (tweak) { /* prevent initiating the border select if the mouse is over a node */ @@ -835,8 +835,8 @@ static int node_select_same_type_step_exec(bContext *C, wmOperator *op) bNode **node_array; bNode *active = nodeGetActive(snode->edittree); int totnodes; - int revert = RNA_boolean_get(op->ptr, "prev"); - int same_type = 1; + const bool revert = RNA_boolean_get(op->ptr, "prev"); + const bool same_type = 1; ntreeGetDependencyList(snode->edittree, &node_array, &totnodes); |