[Bf-blender-cvs] [729a1ab6a0f] master: Despgraph: Make dupli objects inherit the parent's display type

[Clément Foucault]

Commit: 729a1ab6a0f1f7631a1f1bdb03289a715aa61f72
Author: Clément Foucault
Date:   Mon Mar 11 14:01:14 2019 +0100
Branches: master
https://developer.blender.org/rB729a1ab6a0f1f7631a1f1bdb03289a715aa61f72

Despgraph: Make dupli objects inherit the parent's display type

Fix T61152 Instanced Collections Don't Honor Viewport Display Setting

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

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 4aaeaf48040..fdb9ab312a4 100644
--- a/source/blender/depsgraph/intern/depsgraph_query_iter.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
@@ -148,6 +148,7 @@ bool deg_objects_dupli_iterator_next(BLI_Iterator *iter)
 		temp_dupli_object->select_id = dupli_parent->select_id;
 		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->dt = dupli_parent->dt;
 
 		/* Duplicated elements shouldn't care whether their original collection is visible or not. */
 		temp_dupli_object->base_flag |= BASE_VISIBLE;