diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-01-20 18:19:51 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-01-21 05:05:27 +0400 |
| commit | 37242e6b0b1897b3d265a25684eacccfec36ffd0 (patch) | |
| tree | 802e6f1cc5ac9c8baabeb88ad60374b2f5713553 /source/blender/editors | |
| parent | 5ece1594ca725b58960756cbe1ebd2b1123584b6 (diff) | |
Code Cleanup: style
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/space_image/image_ops.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_node/node_edit.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 7 |
3 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index b4d98b0d829..c7a89811573 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -972,7 +972,7 @@ static void image_sequence_get_frames(PointerRNA *ptr, ListBase *frames, char *p /* still in the same sequence */ if ((STREQLEN(base_head, head, FILE_MAX)) && - (STREQLEN(base_tail, tail, FILE_MAX))) + (STREQLEN(base_tail, tail, FILE_MAX))) { BLI_addtail(frames, frame); } diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index ee18f945316..a1d5a1b9b81 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -655,7 +655,8 @@ void ED_node_set_active(Main *bmain, bNodeTree *ntree, bNode *node) nodeClearActiveID(ntree, ID_TE); if (ELEM4(node->type, SH_NODE_OUTPUT, SH_NODE_OUTPUT_MATERIAL, - SH_NODE_OUTPUT_WORLD, SH_NODE_OUTPUT_LAMP)) { + SH_NODE_OUTPUT_WORLD, SH_NODE_OUTPUT_LAMP)) + { bNode *tnode; for (tnode = ntree->nodes.first; tnode; tnode = tnode->next) diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 0eddb68d8a4..1c7ecbc95e7 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -2395,14 +2395,15 @@ void flushTransNodes(TransInfo *t) node->locy = td2d->loc[1] / dpi_fac; #endif /* update node hidden state with transform data TD_HIDDEN + transformInfo T_TOGGLE_HIDDEN */ - hidden_state = (td->flag & TD_HIDDEN) > 0; + hidden_state = (td->flag & TD_HIDDEN) != 0; if (t->state != TRANS_CANCEL) { hidden_state ^= (t->flag & T_TOGGLE_HIDDEN) > 0; } if (hidden_state) { node->flag |= NODE_HIDDEN; - } else { + } + else { node->flag &= ~NODE_HIDDEN; } } @@ -5999,7 +6000,7 @@ static void NodeToTransData(TransData *td, TransData2D *td2d, bNode *node, const td->ext = NULL; td->val = NULL; td->flag |= TD_SELECTED; - if(node->flag & NODE_HIDDEN){ + if (node->flag & NODE_HIDDEN) { td->flag |= TD_HIDDEN; } td->dist = 0.0; |