diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-05-08 16:57:20 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-05-08 18:46:20 +0300 |
| commit | e6d11c6ce66f94549d1fe896c59b67564ae19d68 (patch) | |
| tree | babe12f8b03d92d1a43d880e044bca2394ecd118 /source/blender/depsgraph | |
| parent | 03dd109a84657ebf778dc3c25776f7a93cccf1ac (diff) | |
Collections: remove per collection and view layer engine overrides.
This will be handled by the new view layer override system which will
store data elsewhere, removing the code already for easier refactoring.
Diffstat (limited to 'source/blender/depsgraph')
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph_query_iter.cc | 11 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc | 7 |
2 files changed, 1 insertions, 17 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_query_iter.cc b/source/blender/depsgraph/intern/depsgraph_query_iter.cc index 0399882b659..1726c7c855a 100644 --- a/source/blender/depsgraph/intern/depsgraph_query_iter.cc +++ b/source/blender/depsgraph/intern/depsgraph_query_iter.cc @@ -125,17 +125,6 @@ static bool deg_objects_dupli_iterator_next(BLI_Iterator *iter) temp_dupli_object->transflag &= ~OB_DUPLI; - 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( diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc index 7321b394636..fa988514e33 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc @@ -632,7 +632,6 @@ ID *deg_update_copy_on_write_datablock(const Depsgraph *depsgraph, ListBase gpumaterial_backup; ListBase *gpumaterial_ptr = NULL; Mesh *mesh_evaluated = NULL; - IDProperty *base_collection_properties = NULL; short base_flag = 0; if (check_datablock_expanded(id_cow)) { switch (id_type) { @@ -683,7 +682,6 @@ ID *deg_update_copy_on_write_datablock(const Depsgraph *depsgraph, } } /* Make a backup of base flags. */ - base_collection_properties = object->base_collection_properties; base_flag = object->base_flag; break; } @@ -718,10 +716,7 @@ ID *deg_update_copy_on_write_datablock(const Depsgraph *depsgraph, ((Mesh *)mesh_evaluated->id.orig_id)->edit_btmesh; } } - if (base_collection_properties != NULL) { - object->base_collection_properties = base_collection_properties; - object->base_flag = base_flag; - } + object->base_flag = base_flag; } return id_cow; } |