diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-12-15 12:05:50 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-12-15 12:14:25 +0300 |
| commit | 2ddee0ba5ac7f6fa66cd21111e49ea43226d8b3b (patch) | |
| tree | df65aa895144daa5c7a6c857909e0d8ca5e2da27 /source/blender/depsgraph/intern/depsgraph_query_iter.cc | |
| parent | 569e29c49c1162bd9ee9c0e0c7313ea4ee76c0d0 (diff) | |
Fix dupli-frames (and other duplis)
Even non-group dupli objects need to get the overrides from somewhere.
Getting them from dupli_parent.
Diffstat (limited to 'source/blender/depsgraph/intern/depsgraph_query_iter.cc')
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph_query_iter.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_query_iter.cc b/source/blender/depsgraph/intern/depsgraph_query_iter.cc index d8a54642a85..083dd17217a 100644 --- a/source/blender/depsgraph/intern/depsgraph_query_iter.cc +++ b/source/blender/depsgraph/intern/depsgraph_query_iter.cc @@ -83,9 +83,15 @@ static bool deg_objects_dupli_iterator_next(BLI_Iterator *iter) *temp_dupli_object = *dob->ob; temp_dupli_object->select_color = dupli_parent->select_color; temp_dupli_object->base_flag = dupli_parent->base_flag | BASE_FROMDUPLI; - BLI_assert(dob->collection_properties != NULL); - temp_dupli_object->base_collection_properties = dob->collection_properties; - IDP_MergeGroup(temp_dupli_object->base_collection_properties, dupli_parent->base_collection_properties, false); + + if (dob->collection_properties != NULL) { + temp_dupli_object->base_collection_properties = dob->collection_properties; + IDP_MergeGroup(temp_dupli_object->base_collection_properties, dupli_parent->base_collection_properties, false); + } + else { + temp_dupli_object->base_collection_properties = dupli_parent->base_collection_properties; + } + copy_m4_m4(data->temp_dupli_object.obmat, dob->mat); iter->current = &data->temp_dupli_object; BLI_assert( |