diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-04-21 18:31:55 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-04-21 18:31:55 +0300 |
| commit | 8bd84d8ec9d1b4b6733cb9602242c20c987f263c (patch) | |
| tree | c34ef82c4ce6203d8ad99ba19e5c8421b28a33e5 /source/blender/editors/space_node/node_draw.c | |
| parent | 72794d9e01a1fba6deee0d4af5586f596db162dd (diff) | |
| parent | 33e515671acec007b66565381e5895e66ebf558a (diff) | |
Merge branch 'alembic' into gooseberry
Conflicts:
source/blender/editors/space_view3d/drawvolume.c
Diffstat (limited to 'source/blender/editors/space_node/node_draw.c')
| -rw-r--r-- | source/blender/editors/space_node/node_draw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index b2020daef4d..c5ce1c22c91 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -163,14 +163,14 @@ void ED_node_tag_update_nodetree(Main *bmain, bNodeTree *ntree) ntreeTexCheckCyclics(ntree); } -static int compare_nodes(bNode *a, bNode *b) +static bool compare_nodes(const bNode *a, const bNode *b) { bNode *parent; /* These tell if either the node or any of the parent nodes is selected. * A selected parent means an unselected node is also in foreground! */ - int a_select = (a->flag & NODE_SELECT), b_select = (b->flag & NODE_SELECT); - int a_active = (a->flag & NODE_ACTIVE), b_active = (b->flag & NODE_ACTIVE); + bool a_select = (a->flag & NODE_SELECT) != 0, b_select = (b->flag & NODE_SELECT) != 0; + bool a_active = (a->flag & NODE_ACTIVE) != 0, b_active = (b->flag & NODE_ACTIVE) != 0; /* if one is an ancestor of the other */ /* XXX there might be a better sorting algorithm for stable topological sort, this is O(n^2) worst case */ |