diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-04-25 16:02:22 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-04-25 17:34:55 +0300 |
| commit | 29631ff0136a89a0114e097b12d4de87f22e577c (patch) | |
| tree | 3d9beb02ca14d8a06f1afbdccd754e9b59f16e65 /source/blender/depsgraph/intern/depsgraph_query_iter.cc | |
| parent | 09da47b67a28aa3dd814b5c7d309d3481b39e77c (diff) | |
Depsgraph: Ensure we only expand scene datablock on evaluation
Previously it could have happened on every request to evaluated scene
or view layer.
This commit also removes expansion of view layer and scene from iterator.
Iterator is not to be used before depsgraph is evaluated.
Diffstat (limited to 'source/blender/depsgraph/intern/depsgraph_query_iter.cc')
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph_query_iter.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_query_iter.cc b/source/blender/depsgraph/intern/depsgraph_query_iter.cc index c610e7fc500..6e8e474fca6 100644 --- a/source/blender/depsgraph/intern/depsgraph_query_iter.cc +++ b/source/blender/depsgraph/intern/depsgraph_query_iter.cc @@ -209,11 +209,6 @@ void DEG_iterator_objects_begin(BLI_Iterator *iter, DEGObjectIterData *data) return; } - /* TODO: Calling this forces the scene datablock to be expanded, - * otherwise we get crashes on load with copy-on-write. There may - * be a better solution for this. */ - DEG_get_evaluated_view_layer(depsgraph); - iter->data = data; data->dupli_parent = NULL; data->dupli_list = NULL; |