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/intern
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2017-09-21 13:55:14 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-09-21 15:45:08 +0300
commit9ad2c0b6154b8e11521e9ee0422a79d5e0b9a2e1 (patch)
tree424a2422613eb855726d8b9e1a1b679d5e58f0c1 /intern
parent77377f0ea8152d0ed5009a4940298b081b186787 (diff)
Depsgraph and collection enable/visibility
Iterate over invisible objects too, so lamps can still lit the scene. Also, now you can use a collection to set an object to invisible, not only to visible. For example: Scene > Master collection > bedroom > furniture Scene > View Layer > bedroom (visible) > furniture (invisible) The View Layer has two linked collections, bedroom and furniture. This setup will make the furniture collection invisible. Note: Unlike what was suggested on D2849, this does not make collection visibility influence camera visibility. I will keep this as a separate patch. Reviewers: sergey Subscribers: sergey, brecht, fclem Differential Revision: https://developer.blender.org/D2849
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/blender_object.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp
index 991b834dcfa..635f1d2eb46 100644
--- a/intern/cycles/blender/blender_object.cpp
+++ b/intern/cycles/blender/blender_object.cpp
@@ -519,6 +519,10 @@ void BlenderSync::sync_objects(float motion_time)
++b_dupli_iter)
{
BL::Object b_ob = b_dupli_iter->object();
+ if(!b_ob.is_visible()) {
+ continue;
+ }
+
progress.set_sync_status("Synchronizing object", b_ob.name());
/* load per-object culling data */