diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-01-16 12:15:53 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-01-16 12:15:53 +0400 |
| commit | af93ebcb503293e382f74c2d33554504269d4815 (patch) | |
| tree | e4490d7be44e3532e1655f82c7a7aeb11cc5785c /source/blender/editors/space_outliner | |
| parent | bb1a7e4d8722fda09a3294eea56a537b6f043dd3 (diff) | |
Code Cleanup: style and redundant casts
Diffstat (limited to 'source/blender/editors/space_outliner')
4 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 10f4e011026..2f877e56f94 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -1292,7 +1292,7 @@ static void outliner_draw_tree_element(bContext *C, uiBlock *block, Scene *scene } } else { - if (tree_element_type_active(NULL, scene, soops, te, tselem, 0, false) ) active = 2; + if (tree_element_type_active(NULL, scene, soops, te, tselem, 0, false)) active = 2; glColor4ub(220, 220, 255, alpha); } diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c index 3f0ad45de56..8afd5607121 100644 --- a/source/blender/editors/space_outliner/outliner_edit.c +++ b/source/blender/editors/space_outliner/outliner_edit.c @@ -307,7 +307,7 @@ void OUTLINER_OT_item_rename(wmOperatorType *ot) /* Apply Settings ------------------------------- */ -static int outliner_count_levels(SpaceOops *soops, ListBase *lb, int curlevel) +static int outliner_count_levels(SpaceOops *soops, ListBase *lb, const int curlevel) { TreeElement *te; int level = curlevel, lev; @@ -320,7 +320,7 @@ static int outliner_count_levels(SpaceOops *soops, ListBase *lb, int curlevel) return level; } -int outliner_has_one_flag(SpaceOops *soops, ListBase *lb, short flag, short curlevel) +int outliner_has_one_flag(SpaceOops *soops, ListBase *lb, short flag, const int curlevel) { TreeElement *te; TreeStoreElem *tselem; diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h index 5aaf8b5430b..015d8d64627 100644 --- a/source/blender/editors/space_outliner/outliner_intern.h +++ b/source/blender/editors/space_outliner/outliner_intern.h @@ -177,7 +177,7 @@ void outliner_do_object_operation(struct bContext *C, struct Scene *scene, struc int common_restrict_check(struct bContext *C, struct Object *ob); -int outliner_has_one_flag(struct SpaceOops *soops, ListBase *lb, short flag, short curlevel); +bool outliner_has_one_flag(struct SpaceOops *soops, ListBase *lb, short flag, const int curlevel); void outliner_set_flag(struct SpaceOops *soops, ListBase *lb, short flag, short set); void object_toggle_visibility_cb(struct bContext *C, struct Scene *scene, TreeElement *te, struct TreeStoreElem *tsep, struct TreeStoreElem *tselem); diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index a0af9340fe2..cdc7178e767 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -1278,7 +1278,7 @@ static int do_outliner_operation_event(bContext *C, Scene *scene, ARegion *ar, S /* select object that's clicked on and popup context menu */ if (!(tselem->flag & TSE_SELECTED)) { - if (outliner_has_one_flag(soops, &soops->tree, TSE_SELECTED, 1) ) + if (outliner_has_one_flag(soops, &soops->tree, TSE_SELECTED, 1)) outliner_set_flag(soops, &soops->tree, TSE_SELECTED, 0); tselem->flag |= TSE_SELECTED; |