diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-03-12 04:28:01 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-12 04:28:01 +0300 |
| commit | 022ad416702dabb2086b587d04230dd078478c04 (patch) | |
| tree | fdda2e034d7b0ad54945da68d780ce9e2e6f6d1b /source/blender/depsgraph | |
| parent | 6b39dc7672eb463618efb5538f91961365db5797 (diff) | |
DRW: use object color from instancer
Otherwise it's impossible to set the color of instanced library objects.
Follows convention of instancer controlling draw options.
Diffstat (limited to 'source/blender/depsgraph')
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph_query_iter.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_query_iter.cc b/source/blender/depsgraph/intern/depsgraph_query_iter.cc index fdb9ab312a4..9ce2d0b0981 100644 --- a/source/blender/depsgraph/intern/depsgraph_query_iter.cc +++ b/source/blender/depsgraph/intern/depsgraph_query_iter.cc @@ -149,6 +149,7 @@ bool deg_objects_dupli_iterator_next(BLI_Iterator *iter) 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; + copy_v4_v4(temp_dupli_object->color, dupli_parent->color); /* Duplicated elements shouldn't care whether their original collection is visible or not. */ temp_dupli_object->base_flag |= BASE_VISIBLE; |