Fix T62470: instanced object does not preserve bounds display type.

Inheriting the display type from the instancer should only happen if it's
a simpler one.
This commit is contained in:
2019-03-12 13:21:54 +01:00
parent 84ac6b72c0
commit ca06b84900

View File

@@ -148,7 +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;
temp_dupli_object->dt = MIN2(temp_dupli_object->dt, dupli_parent->dt);
copy_v4_v4(temp_dupli_object->color, dupli_parent->color);
/* Duplicated elements shouldn't care whether their original collection is visible or not. */