[Bf-blender-cvs] [0dd83b385ec] master: Fix T70046: Linked instanced collections not working with local collections

Dalai Felinto noreply at git.blender.org
Tue Sep 24 15:34:31 CEST 2019


Commit: 0dd83b385ec1c48533145f507eb700013a9a362b
Author: Dalai Felinto
Date:   Tue Sep 24 10:32:00 2019 -0300
Branches: master
https://developer.blender.org/rB0dd83b385ec1c48533145f507eb700013a9a362b

Fix T70046: Linked instanced collections not working with local collections

===================================================================

M	source/blender/depsgraph/intern/depsgraph_query_iter.cc

===================================================================

diff --git a/source/blender/depsgraph/intern/depsgraph_query_iter.cc b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
index 251857b58c9..28789968286 100644
--- a/source/blender/depsgraph/intern/depsgraph_query_iter.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
@@ -146,6 +146,8 @@ bool deg_objects_dupli_iterator_next(BLI_Iterator *iter)
     *temp_dupli_object = *dob->ob;
     temp_dupli_object->base_flag = dupli_parent->base_flag | BASE_FROM_DUPLI;
     temp_dupli_object->base_local_view_bits = dupli_parent->base_local_view_bits;
+    temp_dupli_object->runtime.local_collections_bits =
+        dupli_parent->runtime.local_collections_bits;
     temp_dupli_object->dt = MIN2(temp_dupli_object->dt, dupli_parent->dt);
     copy_v4_v4(temp_dupli_object->color, dupli_parent->color);



More information about the Bf-blender-cvs mailing list