blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Fix dupli-frames (and other duplis) 

Even non-group dupli objects need to get the overrides from somewhere.
Getting them from dupli_parent.
This commit is contained in:
Dalai Felinto 2017-12-15 07:05:50 -02:00
parent 569e29c49c
commit 2ddee0ba5a
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/depsgraph/intern/depsgraph_query_iter.cc
View File

@ -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(