diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-11-25 23:39:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-11-25 23:39:14 +0400 |
| commit | 63caaa2b12edf0e0a47764156416fac9d43d3664 (patch) | |
| tree | 39d9455df141edc2f232240da34514b0468dcc28 /source/blender/editors/space_outliner | |
| parent | 5928af11ef97d6d9318d3a06fe32f0d77fc48e9c (diff) | |
Code Cleanup: rename vars for detecting change to be more consistent
rename change/is_change/is_changed/modified -> changed
also use bools over int/short/char and once accidental float.
Diffstat (limited to 'source/blender/editors/space_outliner')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_edit.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_select.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c index 559fb6f932e..3f0ad45de56 100644 --- a/source/blender/editors/space_outliner/outliner_edit.c +++ b/source/blender/editors/space_outliner/outliner_edit.c @@ -273,18 +273,18 @@ static int outliner_item_rename(bContext *C, wmOperator *UNUSED(op), const wmEve SpaceOops *soops = CTX_wm_space_outliner(C); TreeElement *te; float fmval[2]; - bool change = false; + bool changed = false; UI_view2d_region_to_view(&ar->v2d, event->mval[0], event->mval[1], fmval, fmval + 1); for (te = soops->tree.first; te; te = te->next) { if (do_outliner_item_rename(C, ar, soops, te, fmval)) { - change = true; + changed = true; break; } } - return change ? OPERATOR_FINISHED : OPERATOR_PASS_THROUGH; + return changed ? OPERATOR_FINISHED : OPERATOR_PASS_THROUGH; } diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index d1d512409ee..b10b8a46ec6 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -78,7 +78,7 @@ static int outliner_select(SpaceOops *soops, ListBase *lb, int *index, short *se { TreeElement *te; TreeStoreElem *tselem; - int change = 0; + bool changed = false; for (te = lb->first; te && *index >= 0; te = te->next, (*index)--) { tselem = TREESTORE(te); @@ -101,7 +101,7 @@ static int outliner_select(SpaceOops *soops, ListBase *lb, int *index, short *se else tselem->flag &= ~TSE_SELECTED; - change |= 1; + changed |= true; } } else if (TSELEM_OPEN(tselem, soops)) { @@ -113,12 +113,12 @@ static int outliner_select(SpaceOops *soops, ListBase *lb, int *index, short *se * function correctly */ (*index)--; - change |= outliner_select(soops, &te->subtree, index, selecting); + changed |= outliner_select(soops, &te->subtree, index, selecting); (*index)++; } } - return change; + return changed; } /* ****************************************************** */ |