diff options
author | Luca Rood <dev@lucarood.com> | 2017-04-19 12:31:33 +0300 |
---|---|---|
committer | Luca Rood <dev@lucarood.com> | 2017-04-19 17:52:27 +0300 |
commit | 4bee5b80d4c5c3309771424ad40f0a7723c818b1 (patch) | |
tree | 5bedfc5c74b22e78741272cb61f3eed37f18f3df /source/blender/editors/space_outliner/outliner_select.c | |
parent | 2f2420709c95c1af27967daa257553edf9096c7a (diff) |
Convert direct usages of base defines
This replaces all direct usage of:
- FIRSTBASE
- LASTBASE
- BASACT
- OBACT
Some usages still remain in legacy utility functions which are called
all over the place.
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_select.c')
-rw-r--r-- | source/blender/editors/space_outliner/outliner_select.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index 0707f728ff7..157467b1aaf 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -98,14 +98,14 @@ static eOLDrawState tree_element_active_renderlayer( * CTRL+LMB: Select/Deselect object and all cildren * CTRL+SHIFT+LMB: Add/Remove object and all children */ -static void do_outliner_object_select_recursive(Scene *scene, Object *ob_parent, bool select) +static void do_outliner_object_select_recursive(SceneLayer *sl, Object *ob_parent, bool select) { - BaseLegacy *base; + Base *base; - for (base = FIRSTBASE; base; base = base->next) { + for (base = FIRSTBASE_NEW; base; base = base->next) { Object *ob = base->object; - if ((((ob->restrictflag & OB_RESTRICT_VIEW) == 0) && BKE_object_is_child_recursive(ob_parent, ob))) { - ED_base_object_select(base, select ? BA_SELECT : BA_DESELECT); + if ((((base->flag & BASE_VISIBLED) == 0) && BKE_object_is_child_recursive(ob_parent, ob))) { + ED_object_base_select(base, select ? BA_SELECT : BA_DESELECT); } } } @@ -183,7 +183,7 @@ static eOLDrawState tree_element_set_active_object( if (recursive) { /* Recursive select/deselect for Object hierarchies */ - do_outliner_object_select_recursive(scene, ob, (ob->flag & SELECT) != 0); + do_outliner_object_select_recursive(sl, ob, (ob->flag & SELECT) != 0); } if (set != OL_SETSEL_NONE) { |