diff options
Diffstat (limited to 'source/blender/editors/space_node')
-rw-r--r-- | source/blender/editors/space_node/drawnode.c | 12 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_add.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_draw.c | 14 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_edit.c | 16 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_intern.h | 2 |
5 files changed, 24 insertions, 24 deletions
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 5866b5cc12f..82f3b71eb32 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -3766,7 +3766,7 @@ static bool node_link_bezier_handles(View2D *v2d, } else { if (snode == NULL) { - return 0; + return false; } copy_v2_v2(vec[0], cursor); fromreroute = 0; @@ -3778,7 +3778,7 @@ static bool node_link_bezier_handles(View2D *v2d, } else { if (snode == NULL) { - return 0; + return false; } copy_v2_v2(vec[3], cursor); toreroute = 0; @@ -3791,7 +3791,7 @@ static bool node_link_bezier_handles(View2D *v2d, /* Straight line: align all points. */ mid_v2_v2v2(vec[1], vec[0], vec[3]); mid_v2_v2v2(vec[2], vec[1], vec[3]); - return 1; + return true; } dist = curving * 0.10f * fabsf(vec[0][0] - vec[3][0]); @@ -3828,13 +3828,13 @@ static bool node_link_bezier_handles(View2D *v2d, } if (v2d && min_ffff(vec[0][0], vec[1][0], vec[2][0], vec[3][0]) > v2d->cur.xmax) { - return 0; /* clipped */ + return false; /* clipped */ } if (v2d && max_ffff(vec[0][0], vec[1][0], vec[2][0], vec[3][0]) < v2d->cur.xmin) { - return 0; /* clipped */ + return false; /* clipped */ } - return 1; + return true; } /* if v2d not NULL, it clips and returns 0 if not visible */ diff --git a/source/blender/editors/space_node/node_add.c b/source/blender/editors/space_node/node_add.c index 037fe575973..68f4bd0ff38 100644 --- a/source/blender/editors/space_node/node_add.c +++ b/source/blender/editors/space_node/node_add.c @@ -109,12 +109,12 @@ static bool add_reroute_intersect_check(bNodeLink *link, if (isect_seg_seg_v2(mcoords[i], mcoords[i + 1], coord_array[b], coord_array[b + 1]) > 0) { result[0] = (mcoords[i][0] + mcoords[i + 1][0]) / 2.0f; result[1] = (mcoords[i][1] + mcoords[i + 1][1]) / 2.0f; - return 1; + return true; } } } } - return 0; + return false; } typedef struct bNodeSocketLink { diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index 56e53e79a8d..ba6b164704f 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -188,7 +188,7 @@ static bool compare_nodes(const bNode *a, const bNode *b) for (parent = a->parent; parent; parent = parent->parent) { /* if b is an ancestor, it is always behind a */ if (parent == b) { - return 1; + return true; } /* any selected ancestor moves the node forward */ if (parent->flag & NODE_ACTIVE) { @@ -201,7 +201,7 @@ static bool compare_nodes(const bNode *a, const bNode *b) for (parent = b->parent; parent; parent = parent->parent) { /* if a is an ancestor, it is always behind b */ if (parent == a) { - return 0; + return false; } /* any selected ancestor moves the node forward */ if (parent->flag & NODE_ACTIVE) { @@ -214,21 +214,21 @@ static bool compare_nodes(const bNode *a, const bNode *b) /* if one of the nodes is in the background and the other not */ if ((a->flag & NODE_BACKGROUND) && !(b->flag & NODE_BACKGROUND)) { - return 0; + return false; } if (!(a->flag & NODE_BACKGROUND) && (b->flag & NODE_BACKGROUND)) { - return 1; + return true; } /* if one has a higher selection state (active > selected > nothing) */ if (!b_active && a_active) { - return 1; + return true; } if (!b_select && (a_active || a_select)) { - return 1; + return true; } - return 0; + return false; } /* Sorts nodes by selection: unselected nodes first, then selected, diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index ef931dd9bb8..eae8bd05a93 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -358,10 +358,10 @@ bool composite_node_active(bContext *C) if (ED_operator_node_active(C)) { SpaceNode *snode = CTX_wm_space_node(C); if (ED_node_is_compositor(snode)) { - return 1; + return true; } } - return 0; + return false; } /* operator poll callback */ @@ -370,10 +370,10 @@ bool composite_node_editable(bContext *C) if (ED_operator_node_editable(C)) { SpaceNode *snode = CTX_wm_space_node(C); if (ED_node_is_compositor(snode)) { - return 1; + return true; } } - return 0; + return false; } void snode_dag_update(bContext *C, SpaceNode *snode) @@ -1089,21 +1089,21 @@ void NODE_OT_resize(wmOperatorType *ot) /* ********************** hidden sockets ******************** */ -int node_has_hidden_sockets(bNode *node) +bool node_has_hidden_sockets(bNode *node) { bNodeSocket *sock; for (sock = node->inputs.first; sock; sock = sock->next) { if (sock->flag & SOCK_HIDDEN) { - return 1; + return true; } } for (sock = node->outputs.first; sock; sock = sock->next) { if (sock->flag & SOCK_HIDDEN) { - return 1; + return true; } } - return 0; + return false; } void node_set_hidden_sockets(SpaceNode *snode, bNode *node, int set) diff --git a/source/blender/editors/space_node/node_intern.h b/source/blender/editors/space_node/node_intern.h index 9461892360e..7e62170bce5 100644 --- a/source/blender/editors/space_node/node_intern.h +++ b/source/blender/editors/space_node/node_intern.h @@ -212,7 +212,7 @@ void snode_update(struct SpaceNode *snode, struct bNode *node); bool composite_node_active(struct bContext *C); bool composite_node_editable(struct bContext *C); -int node_has_hidden_sockets(struct bNode *node); +bool node_has_hidden_sockets(struct bNode *node); void node_set_hidden_sockets(struct SpaceNode *snode, bNode *node, int set); int node_render_changed_exec(bContext *, struct wmOperator *); int node_find_indicated_socket(struct SpaceNode *snode, |