From ae2af4692009fe2c3fc97783f6d69aaa7cac5123 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 8 Jan 2019 18:19:12 +0100 Subject: Fix inconsistent naming and behavior for base visible/selected/editable. Fixes T60251. --- source/blender/editors/space_view3d/view3d_edit.c | 6 +++--- source/blender/editors/space_view3d/view3d_view.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'source/blender/editors/space_view3d') diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 0586f11452a..070e02074ff 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -299,7 +299,7 @@ static bool view3d_orbit_calc_center(bContext *C, float r_dyn_ofs[3]) zero_v3(select_center); for (base_eval = FIRSTBASE(view_layer_eval); base_eval; base_eval = base_eval->next) { - if (TESTBASE(v3d, base_eval)) { + if (BASE_SELECTED(v3d, base_eval)) { /* use the boundbox if we can */ Object *ob_eval = base_eval->object; @@ -2822,7 +2822,7 @@ static int viewselected_exec(bContext *C, wmOperator *op) /* this is weak code this way, we should make a generic active/selection callback interface once... */ Base *base_eval; for (base_eval = view_layer_eval->object_bases.first; base_eval; base_eval = base_eval->next) { - if (TESTBASELIB(v3d, base_eval)) { + if (BASE_SELECTED_EDITABLE(v3d, base_eval)) { if (base_eval->object->type == OB_ARMATURE) if (base_eval->object->mode & OB_MODE_POSE) break; @@ -2889,7 +2889,7 @@ static int viewselected_exec(bContext *C, wmOperator *op) else { Base *base_eval; for (base_eval = FIRSTBASE(view_layer_eval); base_eval; base_eval = base_eval->next) { - if (TESTBASE(v3d, base_eval)) { + if (BASE_SELECTED(v3d, base_eval)) { if (skip_camera && base_eval->object == v3d->camera) { continue; diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 24143c31463..48caace5fd3 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -1186,7 +1186,7 @@ static bool view3d_localview_init( } else { for (base = FIRSTBASE(view_layer); base; base = base->next) { - if (TESTBASE(v3d, base)) { + if (BASE_SELECTED(v3d, base)) { BKE_object_minmax(base->object, min, max, false); base->local_view_bits |= local_view_bit; ok = true; @@ -1421,7 +1421,7 @@ static int localview_remove_from_exec(bContext *C, wmOperator *op) bool changed = false; for (Base *base = FIRSTBASE(view_layer); base; base = base->next) { - if (TESTBASE(v3d, base)) { + if (BASE_SELECTED(v3d, base)) { base->local_view_bits &= ~v3d->local_view_uuid; ED_object_base_select(base, BA_DESELECT); -- cgit v1.2.3