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_logic/logic_window.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_logic/logic_window.c')
-rw-r--r-- | source/blender/editors/space_logic/logic_window.c | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c index f1a08a45c29..04790f54057 100644 --- a/source/blender/editors/space_logic/logic_window.c +++ b/source/blender/editors/space_logic/logic_window.c @@ -460,14 +460,14 @@ static void set_sca_ob(Object *ob) static ID **get_selected_and_linked_obs(bContext *C, short *count, short scavisflag) { - BaseLegacy *base; - Main *bmain= CTX_data_main(C); - Scene *scene= CTX_data_scene(C); - Object *ob, *obt, *obact= CTX_data_active_object(C); + Base *base; + Main *bmain = CTX_data_main(C); + Scene *scene = CTX_data_scene(C); + SceneLayer *sl = CTX_data_scene_layer(C); + Object *ob, *obt, *obact = CTX_data_active_object(C); ID **idar; bSensor *sens; bController *cont; - unsigned int lay; int a, nr, do_it; /* we need a sorted object list */ @@ -485,19 +485,12 @@ static ID **get_selected_and_linked_obs(bContext *C, short *count, short scavisf ob= ob->id.next; } - /* XXX here it checked 3d lay */ - lay= scene->lay; - - base= FIRSTBASE; - while (base) { - if (base->lay & lay) { - if (base->flag_legacy & SELECT) { - if (scavisflag & BUTS_SENS_SEL) base->object->scavisflag |= OB_VIS_SENS; - if (scavisflag & BUTS_CONT_SEL) base->object->scavisflag |= OB_VIS_CONT; - if (scavisflag & BUTS_ACT_SEL) base->object->scavisflag |= OB_VIS_ACT; - } + for (base = FIRSTBASE_NEW; base; base = base->next) { + if ((base->flag & BASE_VISIBLED) && (base->flag & SELECT)) { + if (scavisflag & BUTS_SENS_SEL) base->object->scavisflag |= OB_VIS_SENS; + if (scavisflag & BUTS_CONT_SEL) base->object->scavisflag |= OB_VIS_CONT; + if (scavisflag & BUTS_ACT_SEL) base->object->scavisflag |= OB_VIS_ACT; } - base= base->next; } if (obact) { |