diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-25 14:50:11 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-25 15:09:17 +0300 |
commit | 817bf582c27d6aa2d19027bb97ed3f708cf6347c (patch) | |
tree | e6e6f0afb0bb8fc5a8711fb66c6aa9b39a8d3508 /source/blender/editors/space_outliner | |
parent | a99dcab148ed209409f3b2479ada12d869ae84b6 (diff) |
Cleanup: rename object base flags to be more clear.
Diffstat (limited to 'source/blender/editors/space_outliner')
4 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 5d2be638964..e617bb40837 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -287,11 +287,11 @@ static void hidebutton_base_flag_cb(bContext *C, void *poin, void *poin2) bool extend = (CTX_wm_window(C)->eventstate->ctrl == 0); /* Undo button toggle, let function do it. */ - base->flag ^= BASE_HIDE; + base->flag ^= BASE_HIDDEN; BKE_base_set_visible(scene, view_layer, base, extend); - if (!extend && (base->flag & BASE_VISIBLED)) { + if (!extend && (base->flag & BASE_VISIBLE)) { /* Auto select solo-ed object. */ ED_object_base_select(base, BA_SELECT); view_layer->basact = base; @@ -516,7 +516,7 @@ static void outliner_draw_restrictbuts( if (base) { bt = uiDefIconButBitS( - block, UI_BTYPE_ICON_TOGGLE, BASE_HIDE, 0, ICON_HIDE_OFF, + block, UI_BTYPE_ICON_TOGGLE, BASE_HIDDEN, 0, ICON_HIDE_OFF, (int)(ar->v2d.cur.xmax - OL_TOG_HIDEX), te->ys, UI_UNIT_X, UI_UNIT_Y, &base->flag, 0, 0, 0, 0, TIP_("Hide object in viewport (Ctrl to isolate)")); diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index 38ae0683d4b..9b430b0af99 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -206,7 +206,7 @@ static void do_outliner_object_select_recursive(ViewLayer *view_layer, Object *o for (base = FIRSTBASE(view_layer); base; base = base->next) { Object *ob = base->object; - if ((((base->flag & BASE_VISIBLED) == 0) && BKE_object_is_child_recursive(ob_parent, ob))) { + if ((((base->flag & BASE_VISIBLE) == 0) && BKE_object_is_child_recursive(ob_parent, ob))) { ED_object_base_select(base, select ? BA_SELECT : BA_DESELECT); } } @@ -1000,7 +1000,7 @@ static void do_outliner_item_activate_tree_element( Object *ob = (Object *)outliner_search_back(soops, te, ID_OB); if ((ob != NULL) && (ob->data == tselem->id)) { Base *base = BKE_view_layer_base_find(view_layer, ob); - if ((base != NULL) && (base->flag & BASE_VISIBLED)) { + if ((base != NULL) && (base->flag & BASE_VISIBLE)) { do_outliner_activate_obdata(C, scene, view_layer, base); } } diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index eec0f083543..e2eb617278b 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -401,7 +401,7 @@ static void object_select_cb( Object *ob = (Object *)tselem->id; Base *base = BKE_view_layer_base_find(view_layer, ob); - if (base && ((base->flag & BASE_VISIBLED) != 0)) { + if (base && ((base->flag & BASE_VISIBLE) != 0)) { base->flag |= BASE_SELECTED; } } diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index 63312561678..9f6c944c914 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -1470,7 +1470,7 @@ static void outliner_add_layer_collection_objects( TreeElement *te_object = outliner_add_element(soops, tree, base->object, ten, 0, 0); te_object->directdata = base; - if (!(base->flag & BASE_VISIBLED)) { + if (!(base->flag & BASE_VISIBLE)) { te_object->flag |= TE_DISABLED; } } @@ -1984,7 +1984,7 @@ static bool outliner_element_visible_get(ViewLayer *view_layer, TreeElement *te, } if (exclude_filter & SO_FILTER_OB_STATE_VISIBLE) { - if ((base->flag & BASE_VISIBLED) == 0) { + if ((base->flag & BASE_VISIBLE) == 0) { return false; } } |