From 9aa1bb6388ac62db1f4c8f2b83bb0c9421bd74dc Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Wed, 23 Oct 2019 13:36:11 -0300 Subject: Fix T70439: Local view always including new objects The same issue is valid for objects from a recently re-enabled collection. --- source/blender/editors/space_view3d/view3d_view.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source/blender/editors/space_view3d/view3d_view.c') diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index d7af307bc53..c64ace77a79 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -1254,6 +1254,9 @@ static bool view3d_localview_init(const Depsgraph *depsgraph, else { Object *obedit = OBEDIT_FROM_VIEW_LAYER(view_layer); if (obedit) { + for (base = FIRSTBASE(view_layer); base; base = base->next) { + base->local_view_bits &= ~local_view_bit; + } FOREACH_BASE_IN_EDIT_MODE_BEGIN (view_layer, v3d, base_iter) { BKE_object_minmax(base_iter->object, min, max, false); base_iter->local_view_bits |= local_view_bit; @@ -1268,6 +1271,9 @@ static bool view3d_localview_init(const Depsgraph *depsgraph, base->local_view_bits |= local_view_bit; ok = true; } + else { + base->local_view_bits &= ~local_view_bit; + } } } -- cgit v1.2.3