Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-01-03 16:20:43 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-01-03 17:19:32 +0300
commitba1cae5a04d429e2f4e58d5fd1e740c70462620a (patch)
treea3299b49718e2cd74f412807fb97156a77d98efa /source/blender/makesrna
parenta2d24345bfead8e4279a818a67d73d42d2565b96 (diff)
Fix some inconsistencies in object visibility/selectability tests.
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r--source/blender/makesrna/intern/rna_object_api.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c
index 163d81d6041..495643b1c7a 100644
--- a/source/blender/makesrna/intern/rna_object_api.c
+++ b/source/blender/makesrna/intern/rna_object_api.c
@@ -142,11 +142,7 @@ static bool rna_Object_visible_get(Object *ob, bContext *C, ReportList *reports)
return false;
}
- if (v3d && v3d->localvd && ((base->local_view_bits & v3d->local_view_uuid) == 0)) {
- return false;
- }
-
- return ((base->flag & BASE_VISIBLE) != 0);
+ return BASE_VISIBLE_BGMODE(v3d, base);
}
static bool rna_Object_holdout_get(Object *ob, ReportList *reports, ViewLayer *view_layer)