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
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2009-12-05 17:12:06 +0300
committerCampbell Barton <ideasman42@gmail.com>2009-12-05 17:12:06 +0300
commitd98cbf7727ccad91545882be4ac4ee4c044fc726 (patch)
tree8f282674388dfc20215fb42cc8290ffdcdff25c0 /source
parentb7e0d5ac3405ff5e58c4130d1814da56ad4491dd (diff)
simple fix [#20218] Object.is_visible() don't reflect visibility
Diffstat (limited to 'source')
-rw-r--r--source/blender/makesrna/intern/rna_object_api.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c
index 827e0cc60d9..63b4549f7c9 100644
--- a/source/blender/makesrna/intern/rna_object_api.c
+++ b/source/blender/makesrna/intern/rna_object_api.c
@@ -311,7 +311,7 @@ static Object *rna_Object_find_armature(Object *ob)
int rna_Object_is_visible(Object *ob, bContext *C)
{
- return ob->lay & CTX_data_scene(C)->lay;
+ return !(ob->restrictflag & OB_RESTRICT_VIEW) && ob->lay & CTX_data_scene(C)->lay;
}
/*