archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cycles: Fix Show Instanced Local View Objects

Browse Source 
The local view check in the RNA didn't support instanced objects. Every
object has a copy of the local_view_bits from the base. This patch
changes the check to look at the local stored bits.

This patch removes the check if the object is part of the view_layer.
In the cases we are using it this check is not relevant. The `mesh_tissue`
add-on also uses it, and is not effected by this change.

Reviewed By: brecht

Differential Revision: https://developer.blender.org/D5773
This commit is contained in:
Jeroen Bakker
2019-09-12 11:25:37 +02:00
parent 613b37bc2c
commit 1954723635
2 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/blender/blender_object.cpp
View File

@@ -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_local_view = !has_local_view || b_ob.local_view_get(b_v3d, b_view_layer);
const bool show_local_view = !has_local_view || b_ob.local_view_get(b_v3d);
const bool show_particles = b_instance.show_particles();
if (show_local_view && (show_self || show_particles)) {