diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2019-10-15 16:42:42 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2019-10-15 16:42:42 +0300 |
| commit | 6d8f5679dbe3dbbd9281a96bbace5cc92e0d5d11 (patch) | |
| tree | 1bfd3e914dc6ac80e6d5c0a67db233e68e99683b /intern/cycles | |
| parent | 6934688f2ca10c78af7256d2c377a93e1f0e4dd7 (diff) | |
| parent | 7df7a8f3f1bbd894febc102e339aa03e59d363b9 (diff) | |
Merge branch 'blender-v2.81-release'
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/blender/blender_object.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp index d3efc18a990..5520cfd5ecf 100644 --- a/intern/cycles/blender/blender_object.cpp +++ b/intern/cycles/blender/blender_object.cpp @@ -555,7 +555,7 @@ void BlenderSync::sync_objects(BL::Depsgraph &b_depsgraph, /* test if object needs to be hidden */ const bool show_self = b_instance.show_self(); const bool show_particles = b_instance.show_particles(); - const bool show_in_viewport = b_ob.visible_in_viewport_get(b_v3d); + const bool show_in_viewport = !b_v3d || b_ob.visible_in_viewport_get(b_v3d); if (show_in_viewport && (show_self || show_particles)) { /* object itself */ |